Cleanup compiler warnings in bsp worker module (#5551)

Pull request: #5551

Author: lefou

core/api/daemon/src/mill/api/daemon/internal/bsp/BspRunModuleApi.scala

@@ -12,7 +12,7 @@ trait BspRunModuleApi extends ModuleApi {
       runClasspath: Seq[Path],
       forkArgs: Seq[String],
       forkWorkingDir: Path,
-      forEnv: Map[String, String],
+      forkEnv: Map[String, String],
       mainClass: Option[String],
       localMainClasses: Seq[String]
   )]

libs/javalib/src/mill/javalib/bsp/BspRunModule.scala

@@ -34,7 +34,7 @@ private[mill] object BspRunModule extends ExternalModule {
           runClasspath: Seq[Path],
           forkArgs: Seq[String],
           forkWorkingDir: Path,
-          forEnv: Map[String, String],
+          forkEnv: Map[String, String],
           mainClass: Option[String],
           localMainClasses: Seq[String]
       )] =

runner/bsp/worker/src/mill/bsp/worker/MillBuildServer.scala

@@ -374,7 +374,7 @@ private class MillBuildServer(
         s"Getting sources of ${sourcesParams.getTargets.asScala.map(_.getUri).mkString(", ")}",
       originId = ""
     ) {
-      case (_, _, id, _: JavaModuleApi, result) => new SourcesItem(
+      case (_, _, id, _, result) => new SourcesItem(
           id,
           (
             result.sources.map(p => sourceItem(os.Path(p), false)) ++

runner/bsp/worker/src/mill/bsp/worker/MillJvmBuildServer.scala

@@ -101,26 +101,19 @@ private trait MillJvmBuildServer extends JvmBuildServer { this: MillBuildServer
             _,
             _,
             id,
-            _: RunModuleApi,
-            (
-              runClasspath,
-              forkArgs,
-              forkWorkingDir,
-              forkEnv,
-              mainClass,
-              localMainClasses
-            )
+            _,
+            res
           ) =>
-        val classpath = runClasspath.map(sanitizeUri)
+        val classpath = res.runClasspath.map(sanitizeUri)
         val item = new JvmEnvironmentItem(
           id,
           classpath.asJava,
-          forkArgs.asJava,
-          forkWorkingDir.toString(),
-          forkEnv.asJava
+          res.forkArgs.asJava,
+          res.forkWorkingDir.toString(),
+          res.forkEnv.asJava
         )
 
-        val classes = mainClass.toList ++ localMainClasses
+        val classes = res.mainClass.toList ++ res.localMainClasses
         item.setMainClasses(classes.map(new JvmMainClass(_, Nil.asJava)).asJava)
         item
     } {

runner/bsp/worker/src/mill/bsp/worker/MillScalaBuildServer.scala

@@ -82,7 +82,7 @@ private trait MillScalaBuildServer extends ScalaBuildServer { this: MillBuildSer
     handlerTasks(
       targetIds = _ => p.getTargets.asScala.toSeq,
       tasks = {
-        case m: ScalaModuleApi with TestModuleApi => m.bspBuildTargetScalaTestClasses
+        case m: (ScalaModuleApi & TestModuleApi) => m.bspBuildTargetScalaTestClasses
       },
       requestDescription = "Getting test classes of {}",
       originId = p.getOriginId

runner/bsp/worker/src/mill/bsp/worker/Utils.scala

@@ -11,7 +11,7 @@ import ch.epfl.scala.bsp4j.{
   TaskId
 }
 import mill.api.ExecResult.{Skipped, Success}
-import mill.api.daemon.internal.{ExecutionResultsApi, JavaModuleApi, TaskApi}
+import mill.api.daemon.internal.{ExecutionResultsApi, TaskApi}
 
 import scala.jdk.CollectionConverters.*
 import scala.util.chaining.scalaUtilChainingOps
@@ -32,7 +32,7 @@ private[mill] object Utils {
       client: BuildClient
   ): Int => Option[BspCompileProblemReporter] = { (moduleHashCode: Int) =>
     bspIdsByModule.find(_._1.hashCode == moduleHashCode).map {
-      case (module: JavaModuleApi, targetId) =>
+      case (module, targetId) =>
         val buildTarget = module.bspBuildTarget
         val taskId = new TaskId(module.hashCode.toString)
         new BspCompileProblemReporter(