From 506ef22117a9994536c30d74833e0d9fd4ff1952 Mon Sep 17 00:00:00 2001
From: Dmitrii Naumenko <dmitrii.naumenko@jetbrains.com>
Date: Thu, 25 Sep 2025 17:44:09 +0200
Subject: [PATCH] Use "java.home" to launch the BSP server even when using the
 sbt script #8300

It's similar to another commit for the cause when sbt-launch is used to start the bsp server:
> Use java home to launch BSP server
> 964c1cba Samuel CLARENC <samuel.clarenc@teads.tv> on 01/07/2021 at 13:48
  committed on 26/07/2021
---
 .../scala/sbt/internal/client/NetworkClient.scala     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index 551e5c2b8..bad78778c 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -361,6 +361,8 @@ class NetworkClient(
             term.isSupershellEnabled
           ).mkString(",")
 
+        // note, java home is generally not expected to be empty, but could be in some unexpected misconfigured cases
+        val javaHomeOpt = Option(Properties.javaHome).filter(_.nonEmpty)
         val cmd = arguments.sbtLaunchJar match {
           case Some(lj) =>
             if (log) {
@@ -375,7 +377,7 @@ class NetworkClient(
                 s"either upgrade $sbtScript to its latest version or make sure it is accessible from $$PATH, and run 'sbt bspConfig'"
               )
             }
-            val java = Option(Properties.javaHome)
+            val java = javaHomeOpt
               .map { javaHome =>
                 s"$javaHome/bin/java"
               }
@@ -383,7 +385,12 @@ class NetworkClient(
             List(java) ++ arguments.sbtArguments ++
               List("-jar", lj, DashDashDetachStdio, DashDashServer)
           case _ =>
-            List(arguments.sbtScript) ++ arguments.sbtArguments ++
+            // From sbt/sbt.sh/sbt.bat:
+            //    --java-home <path>         alternate JAVA_HOME
+            val javaHomeArgs = javaHomeOpt.toSeq.flatMap(javaHome => Seq("--java-home", javaHome))
+            List(arguments.sbtScript) ++
+              javaHomeArgs ++
+              arguments.sbtArguments ++
               List(DashDashDetachStdio, DashDashServer)
         }