Add bsp JavaBuildServerForwardStubs

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
+trait BuildServer extends bsp4j.BuildServer with bsp4j.ScalaBuildServer with bsp4j.JavaBuildServer

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

@@ -195,7 +195,7 @@ final class BspImpl(
       )
     actualLocalServer.setProjectName(inputs.workspace, inputs.projectName)
 
-    val localServer: b.BuildServer with b.ScalaBuildServer =
+    val localServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer =
       if (verbosity >= 3)
         new LoggingBuildServerAll(actualLocalServer)
       else

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

@@ -12,10 +12,10 @@ import scala.build.GeneratedSource
 import scala.build.Logger
 
 class BspServer(
-  bloopServer: b.BuildServer with b.ScalaBuildServer,
+  bloopServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer,
   compile: (() => CompletableFuture[b.CompileResult]) => CompletableFuture[b.CompileResult],
   logger: Logger
-) extends b.BuildServer with b.ScalaBuildServer with BuildServerForwardStubs with ScalaBuildServerForwardStubs with HasGeneratedSources {
+) extends b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer with BuildServerForwardStubs with ScalaBuildServerForwardStubs with JavaBuildServerForwardStubs with HasGeneratedSources {
 
   import BspServer._
 

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

@@ -0,0 +1,13 @@
+package scala.build.bsp
+
+import ch.epfl.scala.bsp4j.{JavacOptionsParams, JavacOptionsResult}
+import ch.epfl.scala.{bsp4j => b}
+
+import java.util.concurrent.CompletableFuture
+
+trait JavaBuildServerForwardStubs extends b.JavaBuildServer {
+  protected def forwardTo: b.JavaBuildServer
+
+  override def buildTargetJavacOptions(params: JavacOptionsParams): CompletableFuture[JavacOptionsResult] =
+    forwardTo.buildTargetJavacOptions(params)
+}

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

@@ -2,5 +2,5 @@ package scala.build.bsp
 
 import ch.epfl.scala.{bsp4j => b}
 
-class LoggingBuildServerAll(val underlying: b.BuildServer with b.ScalaBuildServer)
-  extends LoggingBuildServer with LoggingScalaBuildServer
+class LoggingBuildServerAll(val underlying: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer)
+  extends LoggingBuildServer with LoggingScalaBuildServer with LoggingJavaBuildServer

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

@@ -0,0 +1,11 @@
+package scala.build.bsp
+
+import ch.epfl.scala.{bsp4j => b}
+
+import java.util.concurrent.CompletableFuture
+
+trait LoggingJavaBuildServer extends b.JavaBuildServer {
+  protected def underlying: b.JavaBuildServer
+  override def buildTargetJavacOptions(params: b.JavacOptionsParams): CompletableFuture[b.JavacOptionsResult] =
+    underlying.buildTargetJavacOptions(pprint.better.log(params)).logF
+}

modules/build/src/test/scala/scala/build/tests/BuildTests.scala

@@ -252,7 +252,6 @@ class BuildTests extends munit.FunSuite {
         val end = new bsp4j.Position(2, 2)
         val range = new bsp4j.Range(start, end)
         val d = new bsp4j.Diagnostic(range, "not found: value zz")
-        d.setCode("zz")
         d.setSource("bloop")
         d.setSeverity(bsp4j.DiagnosticSeverity.ERROR)
         d
@@ -282,7 +281,6 @@ class BuildTests extends munit.FunSuite {
         val end = new bsp4j.Position(2, 0) // would have expected (2, 2) here :|
         val range = new bsp4j.Range(start, end)
         val d = new bsp4j.Diagnostic(range, "Not found: zz")
-        d.setCode("zz")
         d.setSource("bloop")
         d.setSeverity(bsp4j.DiagnosticSeverity.ERROR)
         d

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

@@ -237,6 +237,34 @@
     "allDeclaredMethods": true,
     "allDeclaredFields": true
   },
+  {
+    "name": "ch.epfl.scala.bsp4j.JavaBuildServer",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "ch.epfl.scala.bsp4j.JavacOptionsItem",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "ch.epfl.scala.bsp4j.JavacOptionsParams",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "ch.epfl.scala.bsp4j.JavacOptionsResult",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
   {
     "name": "ch.epfl.scala.bsp4j.JvmBuildServer",
     "allDeclaredConstructors": true,
@@ -717,6 +745,13 @@
     "allDeclaredMethods": true,
     "allDeclaredFields": true
   },
+  {
+    "name": "scala.build.bsp.JavaBuildServerForwardStubs",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
   {
     "name": "scala.build.bsp.LoggingBuildClient",
     "allDeclaredConstructors": true,
@@ -745,6 +780,13 @@
     "allDeclaredMethods": true,
     "allDeclaredFields": true
   },
+  {
+    "name": "scala.build.bsp.LoggingJavaBuildServer",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
   {
     "name": "scala.build.bsp.ScalaBuildServerForwardStubs",
     "allDeclaredConstructors": true,

modules/integration-core/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

@@ -55,11 +55,11 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String]) extends m
     pool.shutdown()
   }
 
-  def withBsp[T](root: os.Path, args: Seq[String])(f: (TestBspClient, b.BuildServer with b.ScalaBuildServer) => Future[T]): T = {
+  def withBsp[T](root: os.Path, args: Seq[String])(f: (TestBspClient, b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer) => Future[T]): T = {
 
     // Having issues with local sockets during the tests, never got those outside of tests…
     val proc = os.proc(TestUtil.cli, "bsp", "--bloop-bsp-protocol", "tcp", extraOptions, args).spawn(cwd = root)
-    var remoteServer: b.BuildServer with b.ScalaBuildServer = null
+    var remoteServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer = null
 
     try {
       val (localClient, remoteServer0, shutdownFuture) = TestBspClient.connect(proc.stdout, proc.stdin, pool)
@@ -179,6 +179,13 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String]) extends m
           resp
         }
 
+        val javacOptionsResp = {
+          val resp = await(remoteServer.buildTargetJavacOptions(new b.JavacOptionsParams(targets)).asScala)
+          val foundTargets = resp.getItems.asScala.map(_.getTarget.getUri).map(TestUtil.normalizeUri)
+          expect(foundTargets == Seq(targetUri))
+          resp
+        }
+
         val classDir = os.Path(Paths.get(new URI(scalacOptionsResp.getItems.asScala.head.getClassDirectory)))
 
         val compileResp = {

modules/integration-core/src/test/scala/scala/cli/integration/TestBspClient.scala

@@ -66,13 +66,13 @@ class TestBspClient extends b.BuildClient {
 
 object TestBspClient {
 
-  private trait BuildServer extends b.BuildServer with b.ScalaBuildServer
+  private trait BuildServer extends b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer
 
   def connect(
     in: InputStream,
     out: OutputStream,
     es: ExecutorService
-  ): (TestBspClient, b.BuildServer with b.ScalaBuildServer, Future[Unit]) = {
+  ): (TestBspClient, b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer, Future[Unit]) = {
 
     val localClient = new TestBspClient
 

project/deps.sc

@@ -23,7 +23,7 @@ object Deps {
   }
   def ammonite = ivy"com.lihaoyi:::ammonite:2.4.0-5-534c9436"
   def asm = ivy"org.ow2.asm:asm:9.1"
-  def bloopConfig = ivy"ch.epfl.scala::bloop-config:1.4.8"
+  def bloopConfig = ivy"ch.epfl.scala::bloop-config:1.4.8-83-27d9d739"
   def bsp4j = ivy"ch.epfl.scala:bsp4j:2.0.0-M13"
   def caseApp = ivy"com.github.alexarchambault::case-app:2.1.0-M4"
   def coursierJvm = ivy"io.get-coursier::coursier-jvm:${Versions.coursier}"