review fix

Author: Frotty

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

@@ -157,7 +157,10 @@ private void startGame(WurstGui gui, CompilationResult result) throws Exception
                 return;
             } catch (IOException e) {
                 WLogger.warning("Could not launch Warcraft III", e);
-                launchData = recoverFromLaunchFailure(launchData, e);
+                launchData = resolveLaunchData(recoverFromLaunchFailure(launchData, e));
+                if (launchData == null) {
+                    throw new RequestFailedException(MessageType.Info, "Run canceled.");
+                }
             }
         }
     }
@@ -260,7 +263,11 @@ static String launchFailureMessage(@Nullable File gameExe, IOException failure)
     }
 
     private W3InstallationData resolveLaunchData() {
-        W3InstallationData launchData = w3data;
+        return resolveLaunchData(w3data);
+    }
+
+    @Nullable
+    protected W3InstallationData resolveLaunchData(W3InstallationData launchData) {
         // When the project pins a wc3Patch, only auto-launch an install we can confirm is patch-compliant.
         // A mismatching OR unverifiable client is delegated to the user instead of "randomly" launching and failing.
         while (!isLaunchDataPatchCompliant(launchData)) {
@@ -332,7 +339,7 @@ private static String describeClientVersion(GameVersion version) {
         return kindForVersion(version) + " (" + version + ")";
     }
 
-    private MismatchChoice chooseMismatchAction(String message) {
+    protected MismatchChoice chooseMismatchAction(String message) {
         if (GraphicsEnvironment.isHeadless()) {
             return MismatchChoice.CONTINUE;
         }
@@ -356,7 +363,7 @@ private MismatchChoice chooseMismatchAction(String message) {
         return MismatchChoice.CONTINUE;
     }
 
-    private Optional<W3InstallationData> chooseAlternateGamePath() {
+    protected Optional<W3InstallationData> chooseAlternateGamePath() {
         if (GraphicsEnvironment.isHeadless()) {
             return Optional.empty();
         }
@@ -371,7 +378,7 @@ private Optional<W3InstallationData> chooseAlternateGamePath() {
         return Optional.of(new W3InstallationData(langServer, selectedFolder, true, Optional.empty()));
     }
 
-    private enum MismatchChoice {
+    protected enum MismatchChoice {
         CONTINUE,
         CHOOSE_OTHER,
         CANCEL

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

@@ -205,6 +205,30 @@ public void patchComplianceRequiresKnownMatchingClientWhenPinned() throws Except
         assertFalse(isPatchCompliant(Optional.of(WurstBuildConfig.Wc3Patch.PRE_129), Optional.empty()));
     }
 
+    @Test
+    public void retryLaunchSelectionRechecksPatchCompliance() throws Exception {
+        Path project = projectWithPatch("v1.27b");
+        W3InstallationData reforgedRetry = installationData("warcraft-reforged-retry", "Warcraft III.exe", GameVersion.VERSION_1_32);
+        W3InstallationData legacySelection = installationData("warcraft-legacy-selection", "war3.exe", new GameVersion("1.27"));
+        Path fakeInitialExe = Files.writeString(Files.createTempFile("not-warcraft-initial", ".exe"), "not a PE file");
+
+        PatchComplianceRunMap request = new PatchComplianceRunMap(project, legacySelection, fakeInitialExe.toString());
+
+        W3InstallationData resolved = request.resolveAfterRetry(reforgedRetry);
+
+        assertEquals(request.mismatchPrompts, 1);
+        assertEquals(
+            resolved.getGameExe().orElseThrow().getAbsoluteFile(),
+            legacySelection.getGameExe().orElseThrow().getAbsoluteFile()
+        );
+    }
+
+    private static W3InstallationData installationData(String folderPrefix, String exeName, GameVersion version) throws IOException {
+        Path install = Files.createTempDirectory(folderPrefix);
+        Path exe = Files.writeString(install.resolve(exeName), "not a PE file");
+        return new W3InstallationData(Optional.of(exe.toFile()), Optional.of(version));
+    }
+
     private static boolean isPatchCompliant(Optional<WurstBuildConfig.Wc3Patch> projectKind,
                                             Optional<GameVersion> clientVersion) throws Exception {
         Method method = RunMap.class.getDeclaredMethod("isPatchCompliant", Optional.class, Optional.class);
@@ -274,4 +298,29 @@ Optional<File> gameExe() {
             return w3data.getGameExe();
         }
     }
+
+    private static final class PatchComplianceRunMap extends RunMap {
+        private final W3InstallationData alternateSelection;
+        private int mismatchPrompts = 0;
+
+        PatchComplianceRunMap(Path projectRoot, W3InstallationData alternateSelection, String gameExePath) {
+            super(null, WFile.create(projectRoot), Optional.empty(), Optional.empty(), List.of(), Optional.of(gameExePath));
+            this.alternateSelection = alternateSelection;
+        }
+
+        W3InstallationData resolveAfterRetry(W3InstallationData retrySelection) {
+            return resolveLaunchData(retrySelection);
+        }
+
+        @Override
+        protected MismatchChoice chooseMismatchAction(String message) {
+            mismatchPrompts++;
+            return MismatchChoice.CHOOSE_OTHER;
+        }
+
+        @Override
+        protected Optional<W3InstallationData> chooseAlternateGamePath() {
+            return Optional.of(alternateSelection);
+        }
+    }
 }