Add BspClient to the BspServer constructor arguments

Author: MaciejG604

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

@@ -433,6 +433,7 @@ final class BspImpl(
     )
     lazy val bspServer = new BspServer(
       remoteServer.bloopServer.server,
+      localClient,
       doCompile =>
         compile(bloopSession0, threads.prepareBuildExecutor, reloadableOptions, doCompile),
       logger,
@@ -615,15 +616,16 @@ final class BspImpl(
           }
           else newBloopSession0
 
-        if (previousInputs.projectName != preBuildProject.mainScope.project.projectName)
-          for (client <- finalBloopSession.bspServer.clientOpt) {
-            val newTargetIds = finalBloopSession.bspServer.targetIds
-            val events =
-              newTargetIds.map(buildTargetIdToEvent(_, b.BuildTargetEventKind.CREATED)) ++
-                previousTargetIds.map(buildTargetIdToEvent(_, b.BuildTargetEventKind.DELETED))
-            val didChangeBuildTargetParams = new b.DidChangeBuildTarget(events.asJava)
-            client.onBuildTargetDidChange(didChangeBuildTargetParams)
-          }
+        // TODO MG
+        if (previousInputs.projectName != preBuildProject.mainScope.project.projectName) {
+          val client       = finalBloopSession.bspServer.bspCLient
+          val newTargetIds = finalBloopSession.bspServer.targetIds
+          val events =
+            newTargetIds.map(buildTargetIdToEvent(_, b.BuildTargetEventKind.CREATED)) ++
+              previousTargetIds.map(buildTargetIdToEvent(_, b.BuildTargetEventKind.DELETED))
+          val didChangeBuildTargetParams = new b.DidChangeBuildTarget(events.asJava)
+          client.onBuildTargetDidChange(didChangeBuildTargetParams)
+        }
         CompletableFuture.completedFuture(new Object())
     }
   }

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

@@ -18,6 +18,7 @@ import scala.util.Random
 
 class BspServer(
   bloopServer: b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer & b.JvmBuildServer,
+  client: BuildClient,
   compile: (() => CompletableFuture[b.CompileResult]) => CompletableFuture[b.CompileResult],
   logger: Logger,
   presetIntelliJ: Boolean = false
@@ -28,13 +29,11 @@ class BspServer(
     with JvmBuildServerForwardStubs
     with ManagesBuildTargetsImpl {
 
-  private var client: Option[BuildClient] = None
+  val bspCLient = client
 
   @volatile private var intelliJ: Boolean = presetIntelliJ
   def isIntelliJ: Boolean                 = intelliJ
 
-  def clientOpt: Option[BuildClient] = client
-
   @volatile private var extraDependencySources: Seq[os.Path] = Nil
   def setExtraDependencySources(sourceJars: Seq[os.Path]): Unit = {
     extraDependencySources = sourceJars
@@ -52,7 +51,7 @@ class BspServer(
     val message =
       s"Fatal error has occured within $context. Shutting down the server:\n ${sw.toString}"
     System.err.println(message)
-    client.foreach(_.onBuildLogMessage(new LogMessageParams(MessageType.ERROR, message)))
+    client.onBuildLogMessage(new LogMessageParams(MessageType.ERROR, message))
 
     // wait random bit before shutting down server to reduce risk of multiple scala-cli instances starting bloop at the same time
     val timeout = Random.nextInt(400)

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

@@ -38,7 +38,7 @@ class BspServerTests extends TestUtil.ScalaCliBuildSuite {
     workspace: os.Path,
     scope: Scope = Scope.Main
   ): ScalaScriptBuildServer = {
-    val bspServer = new BspServer(null, null, null)
+    val bspServer = new BspServer(null, null, null, null)
     bspServer.addTarget(projectName, workspace, scope, generatedSources)
 
     bspServer