- B find JetBrains on Windows 64

Co-Authored-By: Samuel Taggart <[email protected]>
Co-Authored-By: Llewellyn Falco <[email protected]>

Author: 3 people

approvaltests-tests/src/test/java/org/approvaltests/reporters/IntelliJReporterTest.java

@@ -0,0 +1,17 @@
+package org.approvaltests.reporters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.approvaltests.reporters.intellij.IntelliJReporter;
+import org.junit.jupiter.api.Test;
+
+public class IntelliJReporterTest
+{
+  @Test
+  public void testFindJetBrainsIdes()
+  {
+    String[] commands = {"C:\\Program Files\\JetBrains\\PyCharm 2025.1.1.1\\bin\\pycharm64.exe"};
+    String result = IntelliJReporter.findJetBrainsIdes(commands);
+    assertEquals("C:\\Program Files\\JetBrains\\PyCharm 2025.1.1.1\\bin\\pycharm64.exe", result);
+  }
+}

approvaltests/src/main/java/org/approvaltests/reporters/intellij/IntelliJReporter.java

@@ -19,15 +19,21 @@ private static String getPath()
   {
     try
     {
-      return findJetBrainsIDEs();
+      return findJetBrainsIdes();
     }
     catch (Throwable e)
     {
       // requires Java 9+
       return "";
     }
   }
-  public static String findJetBrainsIDEs()
+  public static String findJetBrainsIdes()
+  {
+    String[] commands = ProcessHandle.allProcesses().map(p -> p.info().command()).filter(Optional::isPresent)
+        .map(c -> c.get()).toArray(String[]::new);
+    return findJetBrainsIdes(commands);
+  }
+  public static String findJetBrainsIdes(String[] commands)
   {
     Set<String> seenPaths = new HashSet<>();
     String[] keywords = {"idea",
@@ -40,34 +46,27 @@ public static String findJetBrainsIDEs()
                          "rubymine",
                          "appcode",
                          "datagrip"};
-    ProcessHandle[] list = ProcessHandle.allProcesses().toArray(ProcessHandle[]::new);
-    for (ProcessHandle process : list)
+    for (String command : commands)
     {
-      Optional<String> commandOpt = process.info().command();
-      if (commandOpt.isPresent())
+      String lowerCommand = command.toLowerCase();
+      for (String keyword : keywords)
       {
-        String command = commandOpt.get();
-        String lowerCommand = command.toLowerCase();
-        for (String keyword : keywords)
+        if (lowerCommand.contains(keyword) && isMainExecutable(command, keyword))
         {
-          if (lowerCommand.contains(keyword) && isMainExecutable(command, keyword))
+          if (!seenPaths.contains(command))
           {
-            if (!seenPaths.contains(command))
-            {
-              seenPaths.add(command);
-              return command;
-            }
-            break;
+            seenPaths.add(command);
+            return command;
           }
+          break;
         }
       }
-    } ;
+    }
     return "";
   }
-  private static boolean isMainExecutable(String path, String keyword)
+  public static boolean isMainExecutable(String path, String keyword)
   {
     String lowerPath = path.toLowerCase();
-    return lowerPath.endsWith("macos/" + keyword) || lowerPath.endsWith(keyword + ".exe")
-        || lowerPath.endsWith("bin/" + keyword);
+    return lowerPath.endsWith("macos/" + keyword) || lowerPath.contains("bin\\" + keyword);
   }
 }