Use java home to launch BSP server

2021-07-01 13:48:27 +02:00 · 2021-07-01 13:48:27 +02:00 · 964c1cbaa4
parent ab05465ef4
commit 964c1cbaa4
1 changed files with 6 additions and 1 deletions
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@ -342,7 +342,12 @@ class NetworkClient(
                s"either upgrade $sbtScript to its latest version or make sure it is accessible from $$PATH, and run 'sbt bspConfig'"
              )
            }
-            List("java") ++ arguments.sbtArguments ++
+            val java = Option(Properties.javaHome)
+              .map { javaHome =>
+                s"$javaHome/bin/java"
+              }
+              .getOrElse("java")
+            List(java) ++ arguments.sbtArguments ++
              List("-jar", lj, DashDashDetachStdio, DashDashServer)
          case _ =>
            List(arguments.sbtScript) ++ arguments.sbtArguments ++