Support jvmRunEnvironment and jvmTestEnvironment for BSP (#1519)

* Support `jvmRunEnvironment` and `jvmTestEnvironment` for BSP

* Support jvmRunEnvironment and jvmTestEnvironment for BSP logging and proxy

Co-authored-by: Łukasz Wroński <[email protected]>

Author: Gedochao

modules/bloop-rifle/src/main/scala/scala/build/bloop/BuildServer.scala

@@ -2,4 +2,4 @@ package scala.build.bloop
 
 import ch.epfl.scala.bsp4j
 
-trait BuildServer extends bsp4j.BuildServer with bsp4j.ScalaBuildServer with bsp4j.JavaBuildServer
+trait BuildServer extends bsp4j.BuildServer with bsp4j.ScalaBuildServer with bsp4j.JavaBuildServer with bsp4j.JvmBuildServer

modules/build/src/main/scala/scala/build/bsp/BspImpl.scala

@@ -423,15 +423,16 @@ final class BspImpl(
     val currentBloopSession = newBloopSession(initialInputs, reloadableOptions)
     bloopSession.update(null, currentBloopSession, "BSP server already initialized")
 
-    val actualLocalServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer
-      with ScalaScriptBuildServer with HasGeneratedSources =
+    val actualLocalServer
+      : b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer with b.JvmBuildServer
+        with ScalaScriptBuildServer with HasGeneratedSources =
       new BuildServerProxy(
         () => bloopSession.get().bspServer,
         () => onReload()
       )
 
-    val localServer
-      : b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer with ScalaScriptBuildServer =
+    val localServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer
+      with b.JvmBuildServer with ScalaScriptBuildServer =
       if (verbosity >= 3)
         new LoggingBuildServerAll(actualLocalServer)
       else

modules/build/src/main/scala/scala/build/bsp/BspServer.scala

@@ -16,13 +16,15 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Random
 
 class BspServer(
-  bloopServer: b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer,
+  bloopServer: b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer & b.JvmBuildServer,
   compile: (() => CompletableFuture[b.CompileResult]) => CompletableFuture[b.CompileResult],
   logger: Logger,
   presetIntelliJ: Boolean = false
 ) extends b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer with BuildServerForwardStubs
     with ScalaScriptBuildServer
-    with ScalaBuildServerForwardStubs with JavaBuildServerForwardStubs
+    with ScalaBuildServerForwardStubs
+    with JavaBuildServerForwardStubs
+    with JvmBuildServerForwardStubs
     with HasGeneratedSourcesImpl {
 
   private var client: Option[BuildClient] = None
@@ -132,7 +134,8 @@ class BspServer(
     }
   }
 
-  protected def forwardTo: b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer = bloopServer
+  protected def forwardTo
+    : b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer & b.JvmBuildServer = bloopServer
 
   private val supportedLanguages: ju.List[String] = List(
     "scala",

modules/build/src/main/scala/scala/build/bsp/BuildServerProxy.scala

@@ -10,7 +10,7 @@ import scala.build.{GeneratedSource, Inputs}
 class BuildServerProxy(
   bspServer: () => BspServer,
   onReload: () => CompletableFuture[Object]
-) extends b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer
+) extends b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer with b.JvmBuildServer
     with ScalaScriptBuildServer with HasGeneratedSources {
   override def buildInitialize(params: b.InitializeBuildParams)
     : CompletableFuture[b.InitializeBuildResult] = bspServer().buildInitialize(params)
@@ -82,6 +82,14 @@ class BuildServerProxy(
   override def onConnectWithClient(server: b.BuildClient): Unit =
     bspServer().onConnectWithClient(server)
 
+  override def jvmRunEnvironment(params: b.JvmRunEnvironmentParams)
+    : CompletableFuture[b.JvmRunEnvironmentResult] =
+    bspServer().jvmRunEnvironment(params)
+
+  override def jvmTestEnvironment(params: b.JvmTestEnvironmentParams)
+    : CompletableFuture[b.JvmTestEnvironmentResult] =
+    bspServer().jvmTestEnvironment(params)
+
   def targetIds: List[b.BuildTargetIdentifier] = bspServer().targetIds
   def targetScopeIdOpt(scope: Scope): Option[b.BuildTargetIdentifier] =
     bspServer().targetScopeIdOpt(scope)

modules/build/src/main/scala/scala/build/bsp/JvmBuildServerForwardStubs.scala

@@ -0,0 +1,17 @@
+package scala.build.bsp
+
+import ch.epfl.scala.bsp4j as b
+
+import java.util.concurrent.CompletableFuture
+
+trait JvmBuildServerForwardStubs extends b.JvmBuildServer {
+  protected def forwardTo: b.JvmBuildServer
+
+  override def jvmRunEnvironment(params: b.JvmRunEnvironmentParams)
+    : CompletableFuture[b.JvmRunEnvironmentResult] =
+    forwardTo.jvmRunEnvironment(params)
+
+  override def jvmTestEnvironment(params: b.JvmTestEnvironmentParams)
+    : CompletableFuture[b.JvmTestEnvironmentResult] =
+    forwardTo.jvmTestEnvironment(params)
+}

modules/build/src/main/scala/scala/build/bsp/LoggingBuildServerAll.scala

@@ -5,9 +5,10 @@ import ch.epfl.scala.{bsp4j => b}
 import java.util.concurrent.CompletableFuture
 
 class LoggingBuildServerAll(
-  val underlying: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer
+  val underlying: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer with b.JvmBuildServer
     with ScalaScriptBuildServer
 ) extends LoggingBuildServer with LoggingScalaBuildServer with LoggingJavaBuildServer
+    with LoggingJvmBuildServer
     with ScalaScriptBuildServer {
 
   def buildTargetWrappedSources(params: WrappedSourcesParams)

modules/build/src/main/scala/scala/build/bsp/LoggingJvmBuildServer.scala

@@ -0,0 +1,17 @@
+package scala.build.bsp
+
+import ch.epfl.scala.bsp4j as b
+
+import java.util.concurrent.CompletableFuture
+
+trait LoggingJvmBuildServer extends b.JvmBuildServer {
+  protected def underlying: b.JvmBuildServer
+
+  override def jvmRunEnvironment(params: b.JvmRunEnvironmentParams)
+    : CompletableFuture[b.JvmRunEnvironmentResult] =
+    underlying.jvmRunEnvironment(pprint.err.log(params)).logF
+
+  override def jvmTestEnvironment(params: b.JvmTestEnvironmentParams)
+    : CompletableFuture[b.JvmTestEnvironmentResult] =
+    underlying.jvmTestEnvironment(pprint.err.log(params)).logF
+}

modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json

@@ -1018,6 +1018,13 @@
     "allDeclaredMethods": true,
     "allDeclaredFields": true
   },
+  {
+    "name": "scala.build.bsp.JvmBuildServerForwardStubs",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
   {
     "name": "scala.build.bsp.LoggingBuildClient",
     "allDeclaredConstructors": true,
@@ -1046,6 +1053,13 @@
     "allDeclaredMethods": true,
     "allDeclaredFields": true
   },
+  {
+    "name": "scala.build.bsp.LoggingJvmBuildServer",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
   {
     "name": "scala.build.bsp.LoggingScalaBuildServer",
     "allDeclaredConstructors": true,