summaryrefslogtreecommitdiff
path: root/contrib/bsp
diff options
context:
space:
mode:
authorAlexandra Dima <alexandra.dima@jetbrains.com>2019-07-17 16:39:26 +0200
committerSamvel Abrahamyan <samvel1024@gmail.com>2019-10-12 14:33:05 +0200
commit2a092dbb298065aeefc084463326ebfd194f82b5 (patch)
treed536a9634866c434414bf01a0508eed9c9cd962d /contrib/bsp
parent30de346dbc3c0a5ed21e828c80a3176843e2a449 (diff)
downloadmill-2a092dbb298065aeefc084463326ebfd194f82b5.tar.gz
mill-2a092dbb298065aeefc084463326ebfd194f82b5.tar.bz2
mill-2a092dbb298065aeefc084463326ebfd194f82b5.zip
Fixed bug in computing the classDirectory for the scalac options request. Also changed the startServer command from the json connection file.
Diffstat (limited to 'contrib/bsp')
-rw-r--r--contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala
index e87768a6..b191aed9 100644
--- a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala
+++ b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala
@@ -429,7 +429,7 @@ class MillBuildServer(evaluator: Evaluator,
map(pathRef => pathRef.path.toNIO.toAbsolutePath.toUri.toString).toList
val index = m.millModuleSegments.parts.length
- val classDirectory = m.millSourcePath.toNIO.toAbsolutePath.toUri.toString
+ val classDirectory = Evaluator.resolveDestPaths(os.pwd / "out", m.millModuleSegments).out.toIO.toURI.toString//m.millSourcePath.toNIO.toAbsolutePath.toUri.toString
targetScalacOptions ++= List(new ScalacOptionsItem(targetId, options.asJava, classpath.asJava, classDirectory))
case m: JavaModule => targetScalacOptions ++= List()