From 45036a5e3e4a7aa74f5364bba1ec557c6249bcfc Mon Sep 17 00:00:00 2001 From: Alexandra Dima Date: Mon, 29 Jul 2019 17:28:48 +0200 Subject: Fixed the classpath for the scalac option request, so now main classes can be ran from intellij. --- .bsp/mill-bsp.json | 1 - contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .bsp/mill-bsp.json 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 -- cgit v1.2.3