Fixes for LSP running & Improving the install locations

Author: Stefterv

app/build.gradle.kts

@@ -419,7 +419,6 @@ tasks.register<Copy>("renameWindres") {
 }
 tasks.register("includeProcessingResources"){
     dependsOn(
-        "includeJdk",
         "includeCore",
         "includeJavaMode",
         "includeSharedAssets",
@@ -428,6 +427,7 @@ tasks.register("includeProcessingResources"){
         "includeJavaModeResources",
         "renameWindres"
     )
+    mustRunAfter("includeJdk")
     finalizedBy("signResources")
 }
 
@@ -534,6 +534,7 @@ afterEvaluate {
         dependsOn("includeProcessingResources")
     }
     tasks.named("createDistributable").configure {
+        dependsOn("includeJdk")
         finalizedBy("setExecutablePermissions")
     }
 }

app/src/processing/app/Base.java

@@ -166,18 +166,6 @@ static public void main(final String[] args) {
   static private void createAndShowGUI(String[] args) {
     // these times are fairly negligible relative to Base.<init>
 //    long t1 = System.currentTimeMillis();
-    var preferences = java.util.prefs.Preferences.userRoot().node("org/processing/app");
-    var installLocations = new ArrayList<>(List.of(preferences.get("installLocations", "").split(",")));
-    var installLocation = System.getProperty("user.dir") + "^" + Base.getVersionName();
-
-    // Check if the installLocation is already in the list
-    if (!installLocations.contains(installLocation)) {
-      // Add the installLocation to the list
-      installLocations.add(installLocation);
-
-      // Save the updated list back to preferences
-      preferences.put("installLocations", String.join(",", installLocations));
-    }
     // TODO: Cleanup old locations if no longer installed
     // TODO: Cleanup old locations if current version is installed in the same location
 

app/src/processing/app/Processing.kt

@@ -11,6 +11,9 @@ import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.help
 import com.github.ajalt.clikt.parameters.options.option
 import processing.app.ui.Start
+import java.io.File
+import java.util.prefs.Preferences
+import kotlin.concurrent.thread
 
 class Processing: SuspendingCliktCommand("processing"){
     val version by option("-v","--version")
@@ -29,6 +32,11 @@ class Processing: SuspendingCliktCommand("processing"){
             return
         }
 
+        thread {
+            // Update the install locations in preferences
+            updateInstallLocations()
+        }
+
         val subcommand = currentContext.invokedSubcommand
         if (subcommand == null) {
             Start.main(sketches.toTypedArray())
@@ -49,10 +57,13 @@ class LSP: SuspendingCliktCommand("lsp"){
     override fun help(context: Context) = "Start the Processing Language Server"
     override suspend fun run(){
         try {
+            // run in headless mode
+            System.setProperty("java.awt.headless", "true")
+
             // Indirect invocation since app does not depend on java mode
             Class.forName("processing.mode.java.lsp.PdeLanguageServer")
                 .getMethod("main", Array<String>::class.java)
-                .invoke(null, *arrayOf<Any>(emptyList<String>()))
+                .invoke(null, arrayOf<String>())
         } catch (e: Exception) {
             throw InternalError("Failed to invoke main method", e)
         }
@@ -76,9 +87,8 @@ class LegacyCLI(val args: Array<String>): SuspendingCliktCommand( "cli"){
     override suspend fun run(){
         val cliArgs = args.filter { it != "cli" }
         try {
-            if(build){
-                System.setProperty("java.awt.headless", "true")
-            }
+            System.setProperty("java.awt.headless", "true")
+
             // Indirect invocation since app does not depend on java mode
             Class.forName("processing.mode.java.Commander")
                 .getMethod("main", Array<String>::class.java)
@@ -87,4 +97,50 @@ class LegacyCLI(val args: Array<String>): SuspendingCliktCommand( "cli"){
             throw InternalError("Failed to invoke main method", e)
         }
     }
+}
+
+fun updateInstallLocations(){
+    val preferences = Preferences.userRoot().node("org/processing/app")
+    val installLocations = preferences.get("installLocations", "")
+        .split(",")
+        .dropLastWhile { it.isEmpty() }
+        .filter { install ->
+            try{
+                val (path, version) = install.split("^")
+                val file = File(path)
+                if(!file.exists() || file.isDirectory){
+                    return@filter false
+                }
+                // call the path to check if it is a valid install location
+                val process = ProcessBuilder(path, "--version")
+                    .redirectErrorStream(true)
+                    .start()
+                val exitCode = process.waitFor()
+                if(exitCode != 0){
+                    return@filter false
+                }
+                val output = process.inputStream.bufferedReader().readText()
+                return@filter output.contains(version)
+            } catch (e: Exception){
+                false
+            }
+        }
+        .toMutableList()
+    val command = ProcessHandle.current().info().command()
+    if(command.isEmpty) {
+        return
+    }
+    val installLocation = "${command.get()}^${Base.getVersionName()}"
+
+
+    // Check if the installLocation is already in the list
+    if (installLocations.contains(installLocation)) {
+        return
+    }
+
+    // Add the installLocation to the list
+    installLocations.add(installLocation)
+
+    // Save the updated list back to preferences
+    preferences.put("installLocations", java.lang.String.join(",", installLocations))
 }