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

Merge pull request #6761 from gontard/fixBspConfig 

Ensure sbtConfig argv does not need sbt in the path
This commit is contained in:
eugene yokota 2021-12-25 14:48:57 -05:00 committed by GitHub
parent 450c87f576 780665a60c
commit 45aa8cb75c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,11 @@ object BuildServerConnection {
"-Xmx100m", "-Xmx100m",
"-classpath", "-classpath",
classPath, classPath,
"xsbt.boot.Boot", ) ++
"-bsp" sbtScript ++
) ++ sbtScript.orElse(sbtLaunchJar) Vector("xsbt.boot.Boot", "-bsp") ++
(if (sbtScript.isEmpty) sbtLaunchJar else None)
val details = BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv) val details = BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv)
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)