Change HasGeneratedSources to ManagesBuildTargets

Use ProjectName class instead of plain String

Author: MaciejG604

modules/build/src/main/scala/scala/build/Bloop.scala

@@ -11,10 +11,11 @@ import java.io.{File, IOException}
 
 import scala.annotation.tailrec
 import scala.build.EitherCps.{either, value}
+import scala.build.bsp.buildtargets.ProjectName
 import scala.build.errors.{BuildException, ModuleFormatError}
-import scala.build.internal.CsLoggerUtil._
+import scala.build.internal.CsLoggerUtil.*
 import scala.concurrent.duration.FiniteDuration
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 
 object Bloop {
 
@@ -30,7 +31,7 @@ object Bloop {
   }
 
   def compile(
-    projectName: String,
+    projectName: ProjectName,
     buildServer: BuildServer,
     logger: Logger,
     buildTargetsTimeout: FiniteDuration
@@ -39,16 +40,16 @@ object Bloop {
       logger.debug("Listing BSP build targets")
       val results = buildServer.workspaceBuildTargets()
         .get(buildTargetsTimeout.length, buildTargetsTimeout.unit)
-      val buildTargetOpt = results.getTargets.asScala.find(_.getDisplayName == projectName)
+      val buildTargetOpt = results.getTargets.asScala.find(_.getDisplayName == projectName.name)
 
       val buildTarget = buildTargetOpt.getOrElse {
         throw new Exception(
-          s"Expected to find project '$projectName' in build targets (only got ${results.getTargets
+          s"Expected to find project '${projectName.name}' in build targets (only got ${results.getTargets
               .asScala.map("'" + _.getDisplayName + "'").mkString(", ")})"
         )
       }
 
-      logger.debug(s"Compiling $projectName with Bloop")
+      logger.debug(s"Compiling ${projectName.name} with Bloop")
       val compileRes = buildServer.buildTargetCompile(
         new bsp4j.CompileParams(List(buildTarget.getId).asJava)
       ).get()

modules/build/src/main/scala/scala/build/BloopBuildClient.scala

@@ -2,11 +2,12 @@ package scala.build
 
 import ch.epfl.scala.bsp4j
 
+import scala.build.bsp.buildtargets.ProjectName
 import scala.build.options.Scope
 
 trait BloopBuildClient extends bsp4j.BuildClient {
   def setProjectParams(newParams: Seq[String]): Unit
-  def setGeneratedSources(scope: Scope, newGeneratedSources: Seq[GeneratedSource]): Unit
+  def setGeneratedSources(projectName: ProjectName, newGeneratedSources: Seq[GeneratedSource]): Unit
   def diagnostics: Option[Seq[(Either[String, os.Path], bsp4j.Diagnostic)]]
   def clear(): Unit
 }

modules/build/src/main/scala/scala/build/Build.scala

@@ -12,6 +12,7 @@ import java.util.concurrent.{ScheduledExecutorService, ScheduledFuture}
 import scala.annotation.tailrec
 import scala.build.EitherCps.{either, value}
 import scala.build.Ops.*
+import scala.build.bsp.buildtargets.ProjectName
 import scala.build.compiler.{ScalaCompiler, ScalaCompilerMaker}
 import scala.build.errors.*
 import scala.build.input.VirtualScript.VirtualScriptNameRegex
@@ -477,19 +478,24 @@ object Build {
     }
   }
 
-  def projectRootDir(root: os.Path, projectName: String): os.Path =
-    root / Constants.workspaceDirName / projectName
-  def classesRootDir(root: os.Path, projectName: String): os.Path =
+  def projectRootDir(root: os.Path, projectName: ProjectName): os.Path =
+    root / Constants.workspaceDirName / projectName.name
+  def classesRootDir(root: os.Path, projectName: ProjectName): os.Path =
     projectRootDir(root, projectName) / "classes"
-  def classesDir(root: os.Path, projectName: String, scope: Scope, suffix: String = ""): os.Path =
+  def classesDir(
+    root: os.Path,
+    projectName: ProjectName,
+    scope: Scope,
+    suffix: String = ""
+  ): os.Path =
     classesRootDir(root, projectName) / s"${scope.name}$suffix"
 
   def resourcesRegistry(
     root: os.Path,
-    projectName: String,
+    projectName: ProjectName,
     scope: Scope
   ): os.Path =
-    root / Constants.workspaceDirName / projectName / s"resources-${scope.name}"
+    root / Constants.workspaceDirName / projectName.name / s"resources-${scope.name}"
 
   def scalaNativeSupported(
     options: BuildOptions,
@@ -1128,7 +1134,7 @@ object Build {
     }
 
     buildClient.clear()
-    buildClient.setGeneratedSources(scope, generatedSources)
+    buildClient.setGeneratedSources(inputs.scopeProjectName(scope), generatedSources)
 
     val partial = partialOpt.getOrElse {
       options.notForBloopOptions.packageOptions.packageTypeOpt.exists(_.sourceBased)
@@ -1275,7 +1281,7 @@ object Build {
     buildTests: Boolean,
     actionableDiagnostics: Option[Boolean]
   )(using ScalaCliInvokeData): Either[BuildException, Option[Build]] = either {
-    val jmhProjectName = inputs.projectName + "_jmh"
+    val jmhProjectName = inputs.projectName.name + "_jmh"
     val jmhOutputDir   = inputs.workspace / Constants.workspaceDirName / jmhProjectName
     os.remove.all(jmhOutputDir)
     val jmhSourceDir   = jmhOutputDir / "sources"

modules/build/src/main/scala/scala/build/ConsoleBloopBuildClient.scala

@@ -6,6 +6,7 @@ import java.io.File
 import java.net.URI
 import java.nio.file.Paths
 
+import scala.build.bsp.buildtargets.ProjectName
 import scala.build.errors.Severity
 import scala.build.internal.WrapperParams
 import scala.build.internal.util.ConsoleUtils.ScalaCliConsole
@@ -17,7 +18,7 @@ import scala.jdk.CollectionConverters.*
 class ConsoleBloopBuildClient(
   logger: Logger,
   keepDiagnostics: Boolean = false,
-  generatedSources: mutable.Map[Scope, Seq[GeneratedSource]] = mutable.Map()
+  generatedSources: mutable.Map[ProjectName, Seq[GeneratedSource]] = mutable.Map()
 ) extends BloopBuildClient {
   import ConsoleBloopBuildClient._
   private var projectParams = Seq.empty[String]
@@ -32,8 +33,8 @@ class ConsoleBloopBuildClient(
 
   private val diagnostics0 = new mutable.ListBuffer[(Either[String, os.Path], bsp4j.Diagnostic)]
 
-  def setGeneratedSources(scope: Scope, newGeneratedSources: Seq[GeneratedSource]) =
-    generatedSources(scope) = newGeneratedSources
+  def setGeneratedSources(projectName: ProjectName, newGeneratedSources: Seq[GeneratedSource]) =
+    generatedSources(projectName) = newGeneratedSources
   def setProjectParams(newParams: Seq[String]): Unit = {
     projectParams = newParams
   }

modules/build/src/main/scala/scala/build/Project.scala

@@ -1,15 +1,16 @@
 package scala.build
 
-import _root_.bloop.config.{Config => BloopConfig, ConfigCodecs => BloopCodecs}
-import _root_.coursier.{Dependency => CsDependency, core => csCore, util => csUtil}
-import com.github.plokhotnyuk.jsoniter_scala.core.{writeToArray => writeAsJsonToArray}
+import _root_.bloop.config.{Config as BloopConfig, ConfigCodecs as BloopCodecs}
+import _root_.coursier.{Dependency as CsDependency, core as csCore, util as csUtil}
+import com.github.plokhotnyuk.jsoniter_scala.core.writeToArray as writeAsJsonToArray
 import coursier.core.Classifier
 
 import java.io.ByteArrayOutputStream
 import java.nio.charset.StandardCharsets
 import java.nio.file.Path
 import java.util.Arrays
 
+import scala.build.bsp.buildtargets.ProjectName
 import scala.build.options.{ScalacOpt, Scope, ShadowingSeq}
 
 final case class Project(
@@ -21,7 +22,7 @@ final case class Project(
   scalaCompiler: Option[ScalaCompilerParams],
   scalaJsOptions: Option[BloopConfig.JsConfig],
   scalaNativeOptions: Option[BloopConfig.NativeConfig],
-  projectName: String,
+  projectName: ProjectName,
   classPath: Seq[os.Path],
   sources: Seq[os.Path],
   resolution: Option[BloopConfig.Resolution],
@@ -53,7 +54,7 @@ final case class Project(
     baseBloopProject(
       projectName,
       directory.toNIO,
-      (directory / ".bloop" / projectName).toNIO,
+      (directory / ".bloop" / projectName.name).toNIO,
       classesDir.toNIO,
       scope
     )
@@ -117,7 +118,7 @@ final case class Project(
   def writeBloopFile(strictCheck: Boolean, logger: Logger): Boolean = {
     lazy val bloopFileContent =
       writeAsJsonToArray(bloopFile)(BloopCodecs.codecFile)
-    val dest = directory / ".bloop" / s"$projectName.json"
+    val dest = directory / ".bloop" / s"${projectName.name}.json"
     val doWrite =
       if (strictCheck)
         !os.isFile(dest) || {
@@ -176,14 +177,14 @@ object Project {
     )
 
   private def baseBloopProject(
-    name: String,
+    projectName: ProjectName,
     directory: Path,
     out: Path,
     classesDir: Path,
     scope: Scope
   ): BloopConfig.Project = {
     val project = BloopConfig.Project(
-      name = name,
+      name = projectName.name,
       directory = directory,
       workspaceDir = None,
       sources = Nil,

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

@@ -15,6 +15,7 @@ final class BloopSession(
   val bspServer: BspServer,
   val watcher: Build.Watcher
 ) {
+  // TODO this resets diagnostics using paths that do not belong to the build targets
   def resetDiagnostics(localClient: BspClient): Unit =
     for (targetId <- bspServer.targetIds)
       inputs.flattened().foreach {

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

@@ -10,6 +10,7 @@ import java.nio.file.Paths
 import java.util.concurrent.{ConcurrentHashMap, ExecutorService}
 
 import scala.build.Position.File
+import scala.build.bsp.buildtargets.{ManagesBuildTargets, ManagesBuildTargetsImpl}
 import scala.build.bsp.protocol.TextEdit
 import scala.build.errors.{BuildException, CompositeBuildException, Diagnostic, Severity}
 import scala.build.internal.util.WarningMessages
@@ -21,7 +22,7 @@ class BspClient(
   @volatile var logger: Logger,
   var forwardToOpt: Option[b.BuildClient] = None
 ) extends b.BuildClient with BuildClientForwardStubs with BloopBuildClient
-    with HasGeneratedSourcesImpl {
+    with ManagesBuildTargetsImpl {
 
   private def updatedPublishDiagnosticsParams(
     params: b.PublishDiagnosticsParams,
@@ -62,6 +63,8 @@ class BspClient(
                 }
               }
 
+              diag0.setData(scalaDiagnostic)
+
               if (
                 diag0.getMessage.contains(
                   "cannot be a main method since it cannot be accessed statically"
@@ -96,9 +99,10 @@ class BspClient(
   }
 
   private def actualBuildPublishDiagnostics(params: b.PublishDiagnosticsParams): Unit = {
-    val updatedParamsOpt = targetScopeOpt(params.getBuildTarget).flatMap { scope =>
-      generatedSources.getOrElse(scope, HasGeneratedSources.GeneratedSources(Nil))
-        .uriMap
+    val updatedParamsOpt = targetProjectNameOpt(params.getBuildTarget).flatMap { projectName =>
+      val uriMap = managedTargets(projectName).uriMap
+
+      uriMap
         .get(params.getTextDocument.getUri)
         .map { genSource =>
           updatedPublishDiagnosticsParams(params, genSource)