one more cleanup

Author: Frotty

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

@@ -808,7 +808,7 @@ protected File loadMapScript(Optional<File> mapCopy, ModelManager modelManager,
                     "RunArg noExtractMapScript is set but no war3map.j is provided inside the wurst folder");
             }
         }
-        if (MapRequest.mapLastModified > lastMapModified || !MapRequest.mapPath.equals(lastMapPath)) {
+        if (shouldExtractMapScript(scriptFile)) {
             lastMapModified = MapRequest.mapLastModified;
             lastMapPath = MapRequest.mapPath;
             System.out.println("Map not cached yet, extracting script");
@@ -851,6 +851,19 @@ protected File loadMapScript(Optional<File> mapCopy, ModelManager modelManager,
         return scriptFile;
     }
 
+    private static boolean shouldExtractMapScript(File scriptFile) {
+        if (!scriptFile.exists()) {
+            return true;
+        }
+        if (!MapRequest.mapPath.equals(lastMapPath)) {
+            return true;
+        }
+        if (MapRequest.mapLastModified > lastMapModified) {
+            return true;
+        }
+        return MapRequest.mapLastModified > scriptFile.lastModified();
+    }
+
     private static void ensureScriptIsSynced(ModelManager modelManager, File scriptFile) {
         CompilationUnit compilationUnit = modelManager.getCompilationUnit(WFile.create(scriptFile));
         if (compilationUnit == null) {

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

@@ -62,6 +62,44 @@ public void hotReloadExtractionUsesSourceMap() throws Exception {
         assertEquals(Files.readString(scriptFile.toPath()), "source script");
     }
 
+    @Test
+    public void mapScriptIsExtractedWhenWorkspaceScriptIsMissingDespiteStaticCacheHit() throws Exception {
+        File projectFolder = new File("./temp/testProject_extract_missing_script/");
+        File wurstFolder = new File(projectFolder, "wurst");
+        newCleanFolder(wurstFolder);
+
+        File sourceMap = new File(projectFolder, "source_map.w3x");
+        Files.write(sourceMap.toPath(), new byte[] {0x01});
+
+        WurstLanguageServer langServer = new WurstLanguageServer();
+        TestMapRequest request = new TestMapRequest(
+            langServer,
+            Optional.of(sourceMap),
+            List.of(),
+            WFile.create(projectFolder),
+            Map.of(sourceMap, "fresh map script".getBytes(StandardCharsets.UTF_8))
+        );
+
+        MapRequest.mapLastModified = sourceMap.lastModified();
+        MapRequest.mapPath = sourceMap.getAbsolutePath();
+
+        File firstExtract = request.loadMapScriptForTest(
+            Optional.of(sourceMap),
+            new ModelManagerImpl(projectFolder, new BufferManager()),
+            new WurstGuiLogger()
+        );
+        assertEquals(Files.readString(firstExtract.toPath()), "fresh map script");
+
+        Files.delete(firstExtract.toPath());
+        File secondExtract = request.loadMapScriptForTest(
+            Optional.of(sourceMap),
+            new ModelManagerImpl(projectFolder, new BufferManager()),
+            new WurstGuiLogger()
+        );
+
+        assertEquals(Files.readString(secondExtract.toPath()), "fresh map script");
+    }
+
     @Test
     public void cachedMapFileNameIsModeSpecific() throws Exception {
         File projectFolder = new File("./temp/testProject_cache_mode_specific/");