review fix

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java

@@ -79,6 +79,9 @@ public abstract class MapRequest extends UserRequest<Object> {
     public static final String BUILD_COMPILED_LUA_NAME = "02_compiled.lua";
     public static final String BUILD_JHCR_SCRIPT_NAME = "03_jhcr_war3map.j";
 
+    /** RunArgs flag (see {@link RunArgs}) that relaxes Jass type checks and skips PJass; injected for pre-1.24 targets. */
+    private static final String LEGACY_JASS_CHECKS_ARG = "-legacyJassChecks";
+
     /**
      * makes the compilation slower, but more safe by discarding results from the editor and working on a copy of the model
      */
@@ -102,17 +105,21 @@ public MapRequest(WurstLanguageServer langServer, Optional<File> map, List<Strin
                       Optional<String> wc3Path, Optional<String> gameExePath) {
         this.langServer = langServer;
         this.map = map;
-        this.compileArgs = compileArgs;
         this.workspaceRoot = workspaceRoot;
-        this.runArgs = new RunArgs(compileArgs);
         this.wc3Path = wc3Path;
         this.buildConfig = WurstBuildConfig.fromWorkspaceRoot(workspaceRoot);
-        // Patches before 1.24 ship Blizzard common.j/blizzard.j with type mismatches
-        // that the Jass VM tolerates (e.g. real returned as integer). Relax Jass
-        // type checks and skip PJass for such targets so these stock scripts compile.
-        if (buildConfig.isPre124()) {
-            runArgs.setLegacyJassTypeChecks(true);
+        // Patches before 1.24 ship Blizzard common.j/blizzard.j with type mismatches that the
+        // Jass VM tolerates (e.g. a real returned where an integer is declared). Relax Jass type
+        // checks and skip PJass for such targets so these stock scripts compile. Carry the flag
+        // through compileArgs so every RunArgs rebuilt from it (compileScript/compileMap) sees it,
+        // not just this request-level field.
+        if (buildConfig.isPre124() && !compileArgs.contains(LEGACY_JASS_CHECKS_ARG)) {
+            List<String> legacyArgs = new ArrayList<>(compileArgs);
+            legacyArgs.add(LEGACY_JASS_CHECKS_ARG);
+            compileArgs = legacyArgs;
         }
+        this.compileArgs = compileArgs;
+        this.runArgs = new RunArgs(compileArgs);
         if (gameExePath.isPresent() && StringUtils.isNotBlank(gameExePath.get())) {
             Optional<GameVersion> configuredVersion = this instanceof RunMap
                 ? Optional.empty()

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

@@ -5,6 +5,7 @@
 import de.peeeq.wurstio.languageserver.WurstBuildConfig;
 import de.peeeq.wurstio.languageserver.requests.MapRequest;
 import de.peeeq.wurstio.languageserver.requests.RunMap;
+import de.peeeq.wurstscript.RunArgs;
 import de.peeeq.wurstio.utils.W3InstallationData;
 import net.moonlightflower.wc3libs.port.GameVersion;
 import org.testng.annotations.Test;
@@ -211,6 +212,22 @@ private static boolean isPatchCompliant(Optional<WurstBuildConfig.Wc3Patch> proj
         return (boolean) method.invoke(null, projectKind, clientVersion);
     }
 
+    @Test
+    public void pre124PatchPropagatesLegacyJassChecksToCompileArgs() throws Exception {
+        // Pre-1.24: the flag must be carried in compileArgs so the fresh RunArgs that
+        // compileScript/compileMap build (RunArgs(compileArgs)) actually relaxes Jass checks + skips PJass.
+        TestMapRequest legacy = new TestMapRequest(projectWithPatch("v1.23"), Optional.empty(), Optional.empty());
+        assertTrue(legacy.exposedCompileArgs().contains("-legacyJassChecks"),
+            "pre-1.24 build must carry -legacyJassChecks in compileArgs: " + legacy.exposedCompileArgs());
+        assertTrue(new RunArgs(legacy.exposedCompileArgs().toArray(new String[0])).isLegacyJassTypeChecks(),
+            "a RunArgs rebuilt from compileArgs must report legacy Jass checks");
+
+        // Modern target: flag must not be injected.
+        TestMapRequest modern = new TestMapRequest(projectWithPatch("v2.0"), Optional.empty(), Optional.empty());
+        assertFalse(modern.exposedCompileArgs().contains("-legacyJassChecks"),
+            "modern build must not carry the legacy flag: " + modern.exposedCompileArgs());
+    }
+
     private static Path projectWithPatch(String patch) throws Exception {
         Path project = Files.createTempDirectory("wurst-map-request-patch");
         Files.createDirectories(project.resolve("wurst"));
@@ -234,6 +251,10 @@ Optional<File> gameExe() {
             return w3data.getGameExe();
         }
 
+        List<String> exposedCompileArgs() {
+            return compileArgs;
+        }
+
         @Override
         public Object execute(ModelManager modelManager) {
             return null;