! r cleaned up

Co-Authored-By: Llewellyn Falco <[email protected]>
Co-Authored-By: ssilverx <[email protected]>
Co-Authored-By: ollin <[email protected]>

Author: 4 people

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

@@ -17,7 +17,7 @@ void testFindItOnMac()
             "Users/lars/Applications/IntelliJ IDEA Community Edition.app/Contents/MacOS/idea");
     for (String path : validPaths)
     {
-      DiffInfo diffInfo = IntelliJMacResolver.getDiffInfo(userHome, f -> f.equals(path));
+      DiffInfo diffInfo = IntelliJToolboxResolver.getDiffInfoMac(userHome, f -> f.equals(path));
       assertNotEquals("", diffInfo.diffProgram, path);
     }
   }
@@ -30,7 +30,7 @@ void testFindItOnLinux()
             "/home/lars/.local/share/JetBrains/Toolbox/apps/intellij-idea-ultimate/bin/idea.sh");
     for (String path : validPaths)
     {
-      DiffInfo diffInfo = IntelliJMacResolver.getDiffInfoLinux(userHome, f -> f.equals(path));
+      DiffInfo diffInfo = IntelliJToolboxResolver.getDiffInfoLinux(userHome, f -> f.equals(path));
       assertNotEquals("", diffInfo.diffProgram, path);
     }
   }

approvaltests/src/main/java/org/approvaltests/reporters/DiffInfo.java

@@ -18,6 +18,10 @@ public DiffInfo(String diffProgram, String parameters, List<String> fileExtensio
     this.parameters = parameters;
     this.fileExtensions = fileExtensions;
   }
+  public static DiffInfo getNull()
+  {
+    return new DiffInfo(null, null, null);
+  }
   private static String resolveWindowsPath(String diffProgram)
   {
     diffProgram = diffProgram == null ? "" : diffProgram;
@@ -50,6 +54,10 @@ public static String getFirstWorking(String path, String[] paths, String ifNotFo
     }
     return fullPath;
   }
+  public boolean isEmpty()
+  {
+    return "".equals(diffProgram);
+  }
   public static String[] getProgramFilesPaths()
   {
     HashSet<String> paths = new HashSet<>();

approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java

@@ -30,7 +30,7 @@ public static class Mac
         TEXT_AND_IMAGE);
     public static DiffInfo TK_DIFF            = new DiffInfo("/Applications/TkDiff.app/Contents/MacOS/tkdiff",
         TEXT);
-    public static DiffInfo INTELLIJ           = IntelliJMacResolver.findIt();
+    public static DiffInfo INTELLIJ           = IntelliJToolboxResolver.findIt();
     public static DiffInfo VISUAL_STUDIO_CODE = new DiffInfo(
         "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", "-d %s %s", TEXT);
   }

approvaltests/src/main/java/org/approvaltests/reporters/IntelliJMacResolver.java

@@ -0,0 +1,49 @@
+package org.approvaltests.reporters;
+
+import org.lambda.functions.Function1;
+import org.lambda.functions.Function2;
+import org.lambda.query.Queryable;
+
+import java.io.File;
+
+import static org.lambda.query.Queryable.as;
+
+public class IntelliJToolboxResolver
+{
+  private interface Resolver extends Function2<String, Function1<String, Boolean>, DiffInfo>
+  {
+  }
+  public static DiffInfo findIt()
+  {
+    for (Resolver function : new Resolver[]{IntelliJToolboxResolver::getDiffInfoMac,
+                                            IntelliJToolboxResolver::getDiffInfoLinux})
+    {
+      DiffInfo diffInfo = function.call(System.getProperty("user.home"), f -> new File(f).exists());
+      if (!diffInfo.isEmpty())
+      { return diffInfo; }
+    }
+    return DiffInfo.getNull();
+  }
+  public static DiffInfo getDiffInfoMac(String userHome, Function1<String, Boolean> fileExists)
+  {
+    Queryable<String> locations = as("IntelliJ IDEA Ultimate", "IntelliJ IDEA", "IntelliJ IDEA Community",
+        "IntelliJ IDEA Community Edition");
+    Queryable<String> applications = as("/Applications", userHome + "/Applications");
+    String postfix = ".app/Contents/MacOS/idea";
+    return getDiffInfo(fileExists, applications, locations, postfix);
+  }
+  public static DiffInfo getDiffInfoLinux(String userHome, Function1<String, Boolean> fileExists)
+  {
+    Queryable<String> locations = as("intellij-idea-ultimate"); // TODO community
+    Queryable<String> applications = as(userHome + "/.local/share/JetBrains/Toolbox/apps");
+    String postfix = "/bin/idea.sh";
+    return getDiffInfo(fileExists, applications, locations, postfix);
+  }
+  private static DiffInfo getDiffInfo(Function1<String, Boolean> fileExists, Queryable<String> locations,
+      Queryable<String> list, String postfix)
+  {
+    Queryable<String> paths = locations.selectMany(a -> list.select(l -> a + "/" + l + postfix));
+    String matching = paths.first(fileExists);
+    return new DiffInfo(matching, "diff %s %s", GenericDiffReporter.TEXT_FILE_EXTENSIONS);
+  }
+}