diff options
| author | Alexandra Dima <alexandra.dima@jetbrains.com> | 2019-07-29 17:28:48 +0200 |
|---|---|---|
| committer | Samvel Abrahamyan <samvel1024@gmail.com> | 2019-10-12 14:33:12 +0200 |
| commit | 45036a5e3e4a7aa74f5364bba1ec557c6249bcfc (patch) | |
| tree | dd1ae2adb61fc53a57c41002ae0939be320bab94 | |
| parent | e442c892166dc440fe45c3f403e4cfa2a709d68f (diff) | |
| download | mill-45036a5e3e4a7aa74f5364bba1ec557c6249bcfc.tar.gz mill-45036a5e3e4a7aa74f5364bba1ec557c6249bcfc.tar.bz2 mill-45036a5e3e4a7aa74f5364bba1ec557c6249bcfc.zip | |
Fixed the classpath for the scalac option request, so now main classes can be ran from intellij.
| -rw-r--r-- | .bsp/mill-bsp.json | 1 | ||||
| -rw-r--r-- | contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.bsp/mill-bsp.json b/.bsp/mill-bsp.json deleted file mode 100644 index fdc584d0..00000000 --- a/.bsp/mill-bsp.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"mill-bsp","argv":["mill", "-i", "dev.run", "scratch", "-i","mill.contrib.MainMillBuildServer/startServer"],"version":"1.0.0","bspVersion":"2.0.0-M4","languages":["scala","java"]} diff --git a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala index e9f48a19..7454a944 100644 --- a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala +++ b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala @@ -425,7 +425,7 @@ class MillBuildServer(evaluator: Evaluator, module match { case m: ScalaModule => val options = evaluateInformativeTask(evaluator, m.scalacOptions, Seq.empty[String]).toList - val classpath = evaluateInformativeTask(evaluator, m.compileClasspath, Agg.empty[PathRef]). + val classpath = evaluateInformativeTask(evaluator, m.runClasspath, Agg.empty[PathRef]). map(pathRef => pathRef.path.toIO.toURI.toString).toList val classDirectory = (Evaluator.resolveDestPaths(os.pwd / "out" , m.millModuleSegments). dest / "classes").toIO.toURI.toString |