diff options
-rw-r--r-- | contrib/bsp/src/mill/contrib/BSP.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/bsp/src/mill/contrib/BSP.scala b/contrib/bsp/src/mill/contrib/BSP.scala index 5334f509..e3166f25 100644 --- a/contrib/bsp/src/mill/contrib/BSP.scala +++ b/contrib/bsp/src/mill/contrib/BSP.scala @@ -69,11 +69,12 @@ object BSP extends ExternalModule { // creates a Json with the BSP connection details def createBspConnectionJson(): String = { - val millPath = scala.sys.props("MILL_CLASSPATH") + val millPath = scala.sys.props.get("MILL_CLASSPATH").getOrElse(System.getProperty("MILL_CLASSPATH")) + val millVersion = scala.sys.props.get("MILL_VERSION").getOrElse(System.getProperty("MILL_VERSION")) write(BspConfigJson("mill-bsp", List(whichJava, - "-DMILL_CLASSPATH=" + millPath, - s"-DMILL_VERSION=${scala.sys.props("MILL_VERSION")}", + s"-DMILL_CLASSPATH=$millPath", + s"-DMILL_VERSION=$millVersion", "-Djna.nosys=true", "-cp", millPath, @@ -133,4 +134,4 @@ object BSP extends ExternalModule { executor.shutdown() } } -}
\ No newline at end of file +} |