review fixes

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java

@@ -180,7 +180,7 @@ private static String calculateProjectConfigHash(WurstProjectConfigData projectC
                 .append("\n");
             WurstBuildConfig buildConfig = buildConfigFromBuildDir(buildDir);
             sb.append("scriptMode:").append(buildConfig.scriptMode()).append("\n");
-            sb.append("wc3Patch:").append(buildConfig.wc3Patch()).append("\n");
+            sb.append("wc3Patch:").append(buildConfig.wc3PatchName()).append("\n");
 
             return ImportFile.calculateHash(sb.toString().getBytes(StandardCharsets.UTF_8));
         } catch (Exception e) {

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3InstallationData.java

@@ -89,7 +89,7 @@ public W3InstallationData(WurstLanguageServer languageServer, File wc3Path, bool
     }
 
     private void loadFromPath(File wc3Path) {
-        loadFromPath(wc3Path, true);
+        loadFromPath(wc3Path, !version.isPresent());
     }
 
     private void loadFromPath(File wc3Path, boolean shouldParseVersion) {
@@ -160,6 +160,10 @@ private void showFileChooser() {
                 }
             });
 
+            if (selectedFolder == null) {
+                return;
+            }
+
             loadFromPath(selectedFolder);
 
             if (gameExe.isPresent()) {

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/MapRequestPatchTargetTests.java

@@ -11,6 +11,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
+import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -63,6 +64,16 @@ public void pinnedRunMapUsesPatchVersionWithoutParsingExecutable() throws Except
         assertEquals(request.gameExe().orElseThrow().getAbsoluteFile(), fakeExe.toFile().getAbsoluteFile());
     }
 
+    @Test
+    public void configuredVersionSurvivesManualPathLoad() throws Exception {
+        W3InstallationData data = new W3InstallationData(Optional.empty(), Optional.of(new GameVersion("2.0")));
+        Method loadFromPath = W3InstallationData.class.getDeclaredMethod("loadFromPath", File.class);
+        loadFromPath.setAccessible(true);
+
+        loadFromPath.invoke(data, Files.createTempDirectory("not-warcraft-folder").toFile());
+
+        assertEquals(data.getWc3PatchVersion().orElseThrow(), new GameVersion("2.0"));
+    }
 
     @Test
     public void gameVersionParseFailurePrintsShortMessageOnly() throws Exception {

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/WurstBuildConfigTests.java

@@ -1,18 +1,23 @@
 package tests.wurstscript.tests;
 
+import config.WurstProjectConfigData;
 import de.peeeq.wurstio.languageserver.WFile;
+import de.peeeq.wurstio.languageserver.ProjectConfigBuilder;
 import de.peeeq.wurstio.languageserver.WurstBuildConfig;
 import de.peeeq.wurstio.languageserver.WurstCommands;
 import net.moonlightflower.wc3libs.port.GameVersion;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
 
 public class WurstBuildConfigTests {
@@ -162,4 +167,36 @@ public void compileArgsFollowConfiguredScriptMode() throws Exception {
         assertTrue(args.contains("-runcompiletimefunctions"));
         assertFalse(args.contains("-lua"));
     }
+
+    @Test
+    public void projectConfigHashIncludesExactPatchTarget() throws Exception {
+        Path project132 = Files.createTempDirectory("wurst-build-config-hash-132");
+        Files.createDirectories(project132.resolve("_build"));
+        Files.writeString(project132.resolve("wurst.build"), """
+            projectName: Test
+            wc3Patch: v1.32
+            """);
+
+        Path project20 = Files.createTempDirectory("wurst-build-config-hash-20");
+        Files.createDirectories(project20.resolve("_build"));
+        Files.writeString(project20.resolve("wurst.build"), """
+            projectName: Test
+            wc3Patch: v2.0
+            """);
+
+        String hash132 = calculateProjectConfigHash(project132.resolve("_build").toFile());
+        String hash20 = calculateProjectConfigHash(project20.resolve("_build").toFile());
+
+        assertNotEquals(hash132, hash20);
+    }
+
+    private static String calculateProjectConfigHash(File buildDir) throws Exception {
+        Method method = ProjectConfigBuilder.class.getDeclaredMethod(
+            "calculateProjectConfigHash",
+            WurstProjectConfigData.class,
+            File.class
+        );
+        method.setAccessible(true);
+        return (String) method.invoke(null, new WurstProjectConfigData(), buildDir);
+    }
 }