From eac9328db78b5ccd206eed3442caaa1b0fc562d8 Mon Sep 17 00:00:00 2001
From: adpi2 <adrien.piquerez@gmail.com>
Date: Mon, 8 Jun 2020 15:26:21 +0200
Subject: [PATCH] Replace -jar with -classpath in BuildServerConnectionDetails

---
 .../src/main/scala/sbt/internal/server/Server.scala |  4 ++--
 .../sbt/internal/bsp/BuildServerConnection.scala    | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/main-command/src/main/scala/sbt/internal/server/Server.scala b/main-command/src/main/scala/sbt/internal/server/Server.scala
index 9251fe713..3d859d403 100644
--- a/main-command/src/main/scala/sbt/internal/server/Server.scala
+++ b/main-command/src/main/scala/sbt/internal/server/Server.scala
@@ -202,8 +202,8 @@ private[sbt] object Server {
       private[this] def writeBspConnectionDetails(): Unit = {
         import bsp.codec.JsonProtocol._
         val sbtVersion = appConfiguration.provider.id.version
-        val launcherJar = ManagementFactory.getRuntimeMXBean.getClassPath
-        val details = BuildServerConnection.details(sbtVersion, launcherJar)
+        val launcherClassPath = ManagementFactory.getRuntimeMXBean.getClassPath
+        val details = BuildServerConnection.details(sbtVersion, launcherClassPath)
         val json = Converter.toJson(details).get
         IO.write(bspConnectionFile, CompactPrinter(json), append = false)
       }
diff --git a/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala b/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
index c795beaf8..2f328816a 100644
--- a/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
+++ b/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
@@ -12,8 +12,17 @@ object BuildServerConnection {
   final val bspVersion = "2.0.0-M5"
   final val languages = Vector("scala")
 
-  def details(sbtVersion: String, launcherJar: String): BspConnectionDetails = {
-    val argv = Vector("java", "-Xms100m", "-Xmx100m", "-jar", launcherJar, "-bsp")
+  def details(sbtVersion: String, launcherClassPath: String): BspConnectionDetails = {
+    val argv =
+      Vector(
+        "java",
+        "-Xms100m",
+        "-Xmx100m",
+        "-classpath",
+        launcherClassPath,
+        "xsbt.boot.Boot",
+        "-bsp"
+      )
     BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv)
   }
 }