decent improvements

Author: Frotty

de.peeeq.wurstscript/META-INF/MANIFEST.MF

@@ -87,7 +87,7 @@ dependencies {
     antlr "org.antlr:antlr4:4.13.1"
 
     // tool for generating AST-classes
-    compileOnly 'com.github.peterzeller:abstractsyntaxgen:062a7ff178'
+    compileOnly 'com.github.peterzeller:abstractsyntaxgen:f4723157ec'
 
     // JUnit for testing
     testImplementation group: 'org.testng', name: 'testng', version: '7.8.0'
@@ -115,10 +115,10 @@ dependencies {
     implementation 'com.github.albfernandez:juniversalchardet:2.4.0'
 
     // Crigges' jmpq
-    implementation group: 'com.github.inwc3', name: 'jmpq3', version: '264c54cfc8'
+    implementation group: 'com.github.inwc3', name: 'jmpq3', version: 'dac0f9e21a'
 
     // Water's wc3 libs
-    implementation 'com.github.inwc3:wc3libs:00a29ccefd'
+    implementation 'com.github.inwc3:wc3libs:412316b332'
 
     // The setup tool for wurst.build handling
     implementation 'com.github.wurstscript:wurstsetup:475cc7fae8'
@@ -129,6 +129,8 @@ dependencies {
     implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.7.0.202309050840-r'
     implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.ssh.apache', version: '6.7.0.202309050840-r'
 
+    implementation 'it.unimi.dsi:fastutil:8.5.16'
+
     // Smallcheck testing library:
     testImplementation group: 'com.github.peterzeller', name: 'java-smallcheck', version: '3f6a178ba7'
 }

de.peeeq.wurstscript/build.gradle

@@ -21,6 +21,9 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -331,10 +334,7 @@ private void writebackObjectFile(ObjMod<? extends ObjMod.Obj> dataStore, ObjectF
             out.close();
             byte[] w3_ = baos.toByteArray();
 
-            // TODO  wurst exported objects
-            FileUtils.write(
-                exportToWurst(dataStore, fileType),
-                new File(folder.get(), "WurstExportedObjects_" + fileType.getExt() + ".wurst.txt"));
+            exportToWurst(dataStore, fileType, new File(folder.get(), "WurstExportedObjects_" + fileType.getExt() + ".wurst.txt").toPath());
 
             if (inject) {
                 if (mpqEditor == null) {
@@ -351,23 +351,23 @@ private void writebackObjectFile(ObjMod<? extends ObjMod.Obj> dataStore, ObjectF
 
     }
 
-    public String exportToWurst(ObjMod<? extends ObjMod.Obj> dataStore, ObjectFileType fileType) throws IOException {
+    public void exportToWurst(ObjMod<? extends ObjMod.Obj> dataStore,
+                              ObjectFileType fileType, Path outFile) throws IOException {
+        try (BufferedWriter out = Files.newBufferedWriter(outFile, StandardCharsets.UTF_8)) {
+            out.write("package WurstExportedObjects_" + fileType.getExt() + "\n");
+            out.write("import ObjEditingNatives\n\n");
 
-        Appendable out = new StringBuilder();
-        out.append("package WurstExportedObjects_").append(fileType.getExt()).append("\n");
-        out.append("import ObjEditingNatives\n\n");
+            out.write("// Modified Table (contains all custom objects)\n\n");
+            exportToWurst(dataStore.getCustomObjs(), fileType, out);
 
-        out.append("// Modified Table (contains all custom objects)\n\n");
-        exportToWurst(dataStore.getCustomObjs(), fileType, out);
-
-        out.append("// Original Table (contains all modified default objects)\n" +
-            "// Wurst does not support modifying default objects\n" +
-            "// but you can copy these functions and replace 'xxxx' with a new, custom id.\n\n");
-        exportToWurst(dataStore.getOrigObjs(), fileType, out);
-
-        return out.toString();
+            out.write("// Original Table (contains all modified default objects)\n" +
+                "// Wurst does not support modifying default objects\n" +
+                "// but you can copy these functions and replace 'xxxx' with a new, custom id.\n\n");
+            exportToWurst(dataStore.getOrigObjs(), fileType, out);
+        }
     }
 
+
     public void exportToWurst(List<? extends ObjMod.Obj> customObjs, ObjectFileType fileType, Appendable out) throws IOException {
         for (ObjMod.Obj obj : customObjs) {
             String oldId = obj.getBaseId().getVal();

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/intermediateLang/interpreter/ProgramStateIO.java

@@ -182,6 +182,7 @@ protected File compileMap(File projectFolder, WurstGui gui, Optional<File> mapCo
 
                 if (!runArgs.isDisablePjass()) {
                     gui.sendProgress("Running PJass");
+                    timeTaker.beginPhase("Pjass execution");
                     Pjass.Result pJassResult = Pjass.runPjass(outFile,
                         new File(buildDir, "common.j").getAbsolutePath(),
                         new File(buildDir, "blizzard.j").getAbsolutePath());
@@ -192,6 +193,7 @@ protected File compileMap(File projectFolder, WurstGui gui, Optional<File> mapCo
                         }
                         throw new RuntimeException("Could not compile project (PJass error)");
                     }
+                    timeTaker.endPhase();
                 }
 
                 if (runArgs.isHotStartmap()) {
@@ -387,18 +389,30 @@ protected CompilationResult compileScript(ModelManager modelManager, WurstGui gu
         return result;
     }
 
+    private static boolean startsWith(byte[] data, byte[] prefix) {
+        if (data.length < prefix.length) return false;
+        for (int i = 0; i < prefix.length; i++) {
+            if (data[i] != prefix[i]) return false;
+        }
+        return true;
+    }
 
     private File loadMapScript(Optional<File> mapCopy, ModelManager modelManager, WurstGui gui) throws Exception {
         File scriptFile = new File(new File(workspaceRoot.getFile(), "wurst"), "war3map.j");
         // If runargs are no extract, either use existing or throw error
         // Otherwise try loading from map, if map was saved with wurst, try existing script, otherwise error
         if (!mapCopy.isPresent() || runArgs.isNoExtractMapScript()) {
+            System.out.println("No extract map script enabled - not extracting.");
             if (scriptFile.exists()) {
-                modelManager.syncCompilationUnit(WFile.create(scriptFile));
+                System.out.println("war3map.j exists at wurst root.");
+                CompilationUnit compilationUnit = modelManager.getCompilationUnit(WFile.create(scriptFile));
+                if (compilationUnit == null) {
+                    modelManager.syncCompilationUnit(WFile.create(scriptFile));
+                }
                 return scriptFile;
             } else {
                 throw new CompileError(new WPos("", new LineOffsets(), 0, 0),
-                    "RunArg noExtractMapScript is set but no mapscript is provided inside the wurst folder");
+                    "RunArg noExtractMapScript is set but no war3map.j is provided inside the wurst folder");
             }
         }
         if (MapRequest.mapLastModified > lastMapModified || !MapRequest.mapPath.equals(lastMapPath)) {
@@ -421,7 +435,7 @@ private File loadMapScript(Optional<File> mapCopy, ModelManager modelManager, Wu
                     gui.showInfoMessage(err.getMessage());
                     WLogger.severe(err);
                 }
-            } else if (new String(extractedScript, StandardCharsets.UTF_8).startsWith(JassPrinter.WURST_COMMENT_RAW)) {
+            } else if (startsWith(extractedScript, JassPrinter.WURST_COMMENT_RAW.getBytes(StandardCharsets.UTF_8))) {
                 WLogger.info("map has already been compiled with wurst");
                 // file generated by wurst, do not use
                 if (scriptFile.exists()) {

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

@@ -16,7 +16,6 @@ public static ImmutableMultimap<Element, VarDef> calculate(ExprClosure e) {
         // closure itself
         collect(result, e, e.getImplementation());
 
-        // TODO Auto-generated method stub
         return result.build();
     }
 

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/AttrClosureCapturedVariables.java

@@ -4,12 +4,20 @@
 import de.peeeq.wurstscript.gui.WurstGui;
 import de.peeeq.wurstscript.utils.NotNullList;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class ErrorHandler {
 
-    private final List<CompileError> errors = new NotNullList<>();
+    // Public-facing lists (unchanged)
+    private final List<CompileError> errors   = new NotNullList<>();
     private final List<CompileError> warnings = new NotNullList<>();
+
+    // Per-file buckets to avoid O(all) scans
+    private final Map<String, List<CompileError>> errorsByFile   = new HashMap<>();
+    private final Map<String, List<CompileError>> warningsByFile = new HashMap<>();
+
     private final WurstGui gui;
     private boolean unitTestMode = false;
 
@@ -18,7 +26,7 @@ public ErrorHandler(WurstGui gui) {
     }
 
     public int getErrorCount() {
-        return getErrors().size();
+        return errors.size();
     }
 
     public List<CompileError> getWarnings() {
@@ -30,18 +38,21 @@ public List<CompileError> getErrors() {
     }
 
     public void setProgress(String message, double percent) {
-        getGui().sendProgress(message);
+        gui.sendProgress(message);
     }
 
     public WurstGui getGui() {
         return gui;
     }
 
+    /** Called after makeCompileError() decides to keep it. */
     public void sendError(CompileError err) {
         if (err.getErrorType() == ErrorType.ERROR) {
             errors.add(err);
+            addToBucket(errorsByFile, err);
         } else {
             warnings.add(err);
+            addToBucket(warningsByFile, err);
         }
         gui.sendError(err);
     }
@@ -54,4 +65,37 @@ public boolean isUnitTestMode() {
         return unitTestMode;
     }
 
+    // ---------- package-private helpers for ErrorHandling ----------
+
+    List<CompileError> getBucketForFile(String file, ErrorType type) {
+        return (type == ErrorType.ERROR) ? errorsByFile.get(file) : warningsByFile.get(file);
+    }
+
+    void removeFromGlobal(CompileError err) {
+        final String file = err.getSource().getFile();
+        if (err.getErrorType() == ErrorType.ERROR) {
+            errors.remove(err);
+            removeFromBucket(errorsByFile, file, err);
+        } else {
+            warnings.remove(err);
+            removeFromBucket(warningsByFile, file, err);
+        }
+    }
+
+    // ---------- internal helpers ----------
+
+    private static void addToBucket(Map<String, List<CompileError>> byFile, CompileError err) {
+        final String file = err.getSource().getFile();
+        byFile.computeIfAbsent(file, f -> new NotNullList<>()).add(err);
+    }
+
+    private static void removeFromBucket(Map<String, List<CompileError>> byFile, String file, CompileError err) {
+        List<CompileError> bucket = byFile.get(file);
+        if (bucket != null) {
+            bucket.remove(err);
+            if (bucket.isEmpty()) {
+                byFile.remove(file);
+            }
+        }
+    }
 }