one cached map for each input map

Author: Frotty

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

@@ -69,7 +69,7 @@ public abstract class MapRequest extends UserRequest<Object> {
 
     private static Long lastMapModified = 0L;
     private static String lastMapPath = "";
-    protected String cachedMapFileName = "cached_map.w3x";
+    protected String cachedMapFileName = "";
 
     public static final String BUILD_CONFIGURED_SCRIPT_NAME = "01_war3mapj_with_config.j.txt";
     public static final String BUILD_COMPILED_JASS_NAME = "02_compiled.j.txt";
@@ -411,7 +411,24 @@ protected File getCachedMapFile() {
         if (!cacheDir.exists()) {
             UtilsIO.mkdirs(cacheDir);
         }
-        return new File(cacheDir, cachedMapFileName);
+        return new File(cacheDir, resolveCachedMapFileName());
+    }
+
+    private String resolveCachedMapFileName() {
+        if (!cachedMapFileName.isEmpty()) {
+            return cachedMapFileName;
+        }
+        if (!map.isPresent()) {
+            return "cached_map.w3x";
+        }
+        File inputMap = map.get();
+        String inputName = inputMap.getName();
+        int dot = inputName.lastIndexOf('.');
+        String baseName = dot > 0 ? inputName.substring(0, dot) : inputName;
+        // Keep only filesystem-safe characters and avoid collisions for same basename from different folders.
+        String safeBase = baseName.replaceAll("[^a-zA-Z0-9._-]", "_");
+        String pathHash = Integer.toUnsignedString(inputMap.getAbsolutePath().hashCode(), 36);
+        return safeBase + "_" + pathHash + "_cached.w3x";
     }
 
     protected File ensureWritableTargetFile(File targetFile, String dialogTitle, String lockMessage,

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/CyclicFunctionRemover.java

@@ -41,15 +41,16 @@ private void removeCycles(List<List<ImFunction>> components) {
         for (List<ImFunction> component : components) {
             if (component.size() > 1) {
                 // keep list for order; set for O(1) membership
-                Set<ImFunction> funcSet = new HashSet<>(component);
+                Set<ImFunction> funcSet = Collections.newSetFromMap(new IdentityHashMap<>());
+                funcSet.addAll(component);
                 removeCycle(component, funcSet);
             }
         }
     }
 
     private void removeCycle(List<ImFunction> funcs, Set<ImFunction> funcSet) {
         List<ImVar> newParameters = Lists.newArrayList();
-        Map<ImVar, ImVar> oldToNewVar = Maps.newLinkedHashMap();
+        Map<ImVar, ImVar> oldToNewVar = new IdentityHashMap<>();
 
         calculateNewParameters(funcs, newParameters, oldToNewVar);
 
@@ -90,11 +91,11 @@ private void removeCycle(List<ImFunction> funcs, Set<ImFunction> funcSet) {
             stmts = elseBlock;
         }
 
-        Map<ImFunction, Integer> funcToIndex = new HashMap<>();
+        Map<ImFunction, Integer> funcToIndex = new IdentityHashMap<>();
         for (int i = 0; i < funcs.size(); i++) {
             funcToIndex.put(funcs.get(i), i);
         }
-        Map<ImFunction, ImFunction> proxyByOriginal = new HashMap<>();
+        Map<ImFunction, ImFunction> proxyByOriginal = new IdentityHashMap<>();
         // Rewrite only affected roots:
         // - merged cycle body (contains moved bodies from all old funcs)
         // - callers that directly call any removed function
@@ -107,8 +108,8 @@ private void removeCycle(List<ImFunction> funcs, Set<ImFunction> funcSet) {
         }
         for (ImFunction caller : new ArrayList<>(tr.getCalledFunctions().keySet())) {
             Collection<ImFunction> called = tr.getCalledFunctions().get(caller);
-            for (ImFunction removed : funcSet) {
-                if (called.contains(removed)) {
+            for (ImFunction c : called) {
+                if (funcSet.contains(c)) {
                     rewriteRoots.add(caller.getBody());
                     break;
                 }