luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5594 from adpi2/develop 

Replace -jar with -classpath in BSPConnectionDetails
This commit is contained in:
eugene yokota 2020-06-08 12:22:44 -04:00 committed by GitHub
parent 37d1cd98eb eac9328db7
commit 67a09713d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main-command/src/main/scala/sbt/internal/server/Server.scala
View File

@ -202,8 +202,8 @@ private[sbt] object Server {
private[this] def writeBspConnectionDetails(): Unit = { private[this] def writeBspConnectionDetails(): Unit = {
import bsp.codec.JsonProtocol._ import bsp.codec.JsonProtocol._
val sbtVersion = appConfiguration.provider.id.version val sbtVersion = appConfiguration.provider.id.version
val launcherJar = ManagementFactory.getRuntimeMXBean.getClassPath val launcherClassPath = ManagementFactory.getRuntimeMXBean.getClassPath
val details = BuildServerConnection.details(sbtVersion, launcherJar) val details = BuildServerConnection.details(sbtVersion, launcherClassPath)
val json = Converter.toJson(details).get val json = Converter.toJson(details).get
IO.write(bspConnectionFile, CompactPrinter(json), append = false) IO.write(bspConnectionFile, CompactPrinter(json), append = false)
} }

13
protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
View File

@ -12,8 +12,17 @@ object BuildServerConnection {
final val bspVersion = "2.0.0-M5" final val bspVersion = "2.0.0-M5"
final val languages = Vector("scala") final val languages = Vector("scala")
def details(sbtVersion: String, launcherJar: String): BspConnectionDetails = { def details(sbtVersion: String, launcherClassPath: String): BspConnectionDetails = {
val argv = Vector("java", "-Xms100m", "-Xmx100m", "-jar", launcherJar, "-bsp") val argv =
Vector(
"java",
"-Xms100m",
"-Xmx100m",
"-classpath",
launcherClassPath,
"xsbt.boot.Boot",
"-bsp"
)
BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv) BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv)
} }
} }