Don't assume a Zinc compiler in BSP JVM extension

Instead we use the compilation-task independent discovery of main classes.
com-lihaoyi · Aug 29, 2024 · cc0f74f · cc0f74f
1 parent 57aa172
commit cc0f74f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/bsp/worker/src/mill/bsp/worker/MillJvmBuildServer.scala b/bsp/worker/src/mill/bsp/worker/MillJvmBuildServer.scala
@@ -52,13 +52,13 @@ private trait MillJvmBuildServer extends JvmBuildServer { this: MillBuildServer
         case m: JavaModule =>
           T.task {
             (
+              m.localRunClasspath(),
               m.runClasspath(),
               m.forkArgs(),
               m.forkWorkingDir(),
               m.forkEnv(),
               m.mainClass(),
-              m.zincWorker().worker(),
-              m.compile()
+              m.zincWorker().worker()
             )
           }
       }
@@ -69,7 +69,7 @@ private trait MillJvmBuildServer extends JvmBuildServer { this: MillBuildServer
             state,
             id,
             _: JavaModule,
-            (runClasspath, forkArgs, forkWorkingDir, forkEnv, mainClass, zincWorker, compile)
+            (localRunClasspath, runClasspath, forkArgs, forkWorkingDir, forkEnv, mainClass, zincWorker)
           ) =>
         val classpath = runClasspath.map(_.path).map(sanitizeUri)
         val item = new JvmEnvironmentItem(
@@ -80,8 +80,8 @@ private trait MillJvmBuildServer extends JvmBuildServer { this: MillBuildServer
           forkEnv.asJava
         )
 
-        val classes = mainClass.toList ++ zincWorker.discoverMainClasses(compile)
-        item.setMainClasses(classes.map(new JvmMainClass(_, Nil.asJava)).asJava)
+        val classes = mainClass.toList ++ zincWorker.discoverMainClasses(localRunClasspath.map(_.path))
+        item.setMainClasses(classes.distinct.map(new JvmMainClass(_, Nil.asJava)).asJava)
         item
     } {
       agg