Compose inputs in SetupIde, add fixes to Bsp initial configuration

Author: MaciejG604

modules/build/src/main/scala/scala/build/input/InputsComposer.scala

@@ -13,6 +13,36 @@ import scala.collection.mutable
 
 object InputsComposer {
 
+  // TODO errors on corner cases
+  def findModuleConfig(
+    args: Seq[String],
+    cwd: os.Path
+  ): Either[ModuleConfigurationError, Option[os.Path]] = {
+    def moduleConfigDirectlyFromArgs = {
+      val moduleConfigPathOpt = args
+        .map(arg => os.Path(arg, cwd))
+        .find(_.endsWith(os.RelPath(Constants.moduleConfigFileName)))
+
+      moduleConfigPathOpt match {
+        case Some(path) if os.exists(path) => Right(Some(path))
+        case Some(path) => Left(ModuleConfigurationError(
+            s"""File does not exist:
+               | - $path
+               |""".stripMargin
+          ))
+        case None => Right(None)
+      }
+    }
+
+    def moduleConfigFromCwd =
+      Right(os.walk(cwd).find(p => p.endsWith(os.RelPath(Constants.moduleConfigFileName))))
+
+    for {
+      fromArgs <- moduleConfigDirectlyFromArgs
+      fromCwd  <- moduleConfigFromCwd
+    } yield fromArgs.orElse(fromCwd)
+  }
+
   private[input] object Keys {
     val modules   = "modules"
     val roots     = "roots"
@@ -107,7 +137,7 @@ final case class InputsComposer(
 
   def getModuleInputs: Either[BuildException, Seq[ModuleInputs]] =
     if allowForbiddenFeatures then
-      findModuleConfig match {
+      findModuleConfig(args, cwd) match {
         case Right(Some(moduleConfigPath)) =>
           val configText = os.read(moduleConfigPath)
           for {
@@ -129,33 +159,6 @@ final case class InputsComposer(
 //    case _ => Left("scalaVersion must be a string")
 //  }
 
-  // TODO errors on corner cases
-  private def findModuleConfig: Either[ModuleConfigurationError, Option[os.Path]] = {
-    def moduleConfigDirectlyFromArgs = {
-      val moduleConfigPathOpt = args
-        .map(arg => os.Path(arg, cwd))
-        .find(_.endsWith(os.RelPath(Constants.moduleConfigFileName)))
-
-      moduleConfigPathOpt match {
-        case Some(path) if os.exists(path) => Right(Some(path))
-        case Some(path) => Left(ModuleConfigurationError(
-            s"""File does not exist:
-               | - $path
-               |""".stripMargin
-          ))
-        case None => Right(None)
-      }
-    }
-
-    def moduleConfigFromCwd =
-      Right(os.walk(cwd).find(p => p.endsWith(os.RelPath(Constants.moduleConfigFileName))))
-
-    for {
-      fromArgs <- moduleConfigDirectlyFromArgs
-      fromCwd  <- moduleConfigFromCwd
-    } yield fromArgs.orElse(fromCwd)
-  }
-
   private def checkForCycles(modules: Seq[ModuleDefinition])
     : Either[ModuleConfigurationError, Unit] = either {
     val lookup   = Map.from(modules.map(module => module.name -> module))
@@ -195,10 +198,12 @@ final case class InputsComposer(
     modules: Seq[ModuleDefinition],
     moduleConfigPath: os.Path
   ): Either[BuildException, Seq[ModuleInputs]] = either {
+    val workspacePath = moduleConfigPath / os.up
     val moduleInputsInfo = modules.map { m =>
-      val moduleName   = ProjectName(m.name)
-      val moduleInputs = inputsFromArgs(m.roots, Some(moduleName))
-      m -> value(moduleInputs)
+      val moduleName        = ProjectName(m.name)
+      val argsWithWorkspace = m.roots.map(r => os.Path(r, workspacePath).toString)
+      val moduleInputs      = inputsFromArgs(argsWithWorkspace, Some(moduleName))
+      m -> value(moduleInputs).copy(mayAppendHash = false)
     }
 
     val projectNameMap: Map[String, ProjectName] =
@@ -208,7 +213,8 @@ final case class InputsComposer(
       val moduleDeps: Seq[ProjectName] = moduleDef.dependsOn.map(projectNameMap)
 
       inputs.dependsOn(moduleDeps)
-        .withForcedWorkspace(moduleConfigPath / os.up)
+        .withForcedWorkspace(workspacePath)
+        .copy(mayAppendHash = false)
     }
 
     moduleInputs

modules/cli/src/main/scala/scala/cli/commands/bsp/Bsp.scala

@@ -86,7 +86,7 @@ object Bsp extends ScalaCommand[BspOptions] {
     val preprocessInputs: Seq[String] => Either[BuildException, Seq[(ModuleInputs, BuildOptions)]] =
       argsSeq =>
         either {
-          val sharedOptions    = getSharedOptions()
+          val sharedOptions   = getSharedOptions()
           val launcherOptions = getLauncherOptions()
           val envs            = getEnvsFromFile()
 
@@ -136,9 +136,13 @@ object Bsp extends ScalaCommand[BspOptions] {
     val inputsAndBuildOptions = preprocessInputs(args.all).orExit(logger)
 
     // TODO reported override option values
+    // FIXME Only some options need to be unified for the whole project, like scala version, JVM
     val finalBuildOptions = inputsAndBuildOptions.map(_._2).reduceLeft(_ orElse _)
     val inputs            = inputsAndBuildOptions.map(_._1)
 
+    if (options.shared.logging.verbosity >= 3)
+      pprint.err.log(finalBuildOptions)
+
     /** values used for launching the bsp, especially for launching the bloop server, they do not
       * include options extracted from sources, except in bloopRifleConfig - it's needed for
       * correctly launching the bloop server

modules/cli/src/main/scala/scala/cli/commands/setupide/SetupIde.scala

@@ -7,12 +7,11 @@ import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
 import com.google.gson.GsonBuilder
 
 import java.nio.charset.{Charset, StandardCharsets}
-
 import scala.build.EitherCps.{either, value}
 import scala.build.*
 import scala.build.bsp.IdeInputs
 import scala.build.errors.{BuildException, WorkspaceError}
-import scala.build.input.{ModuleInputs, OnDisk, Virtual, WorkspaceOrigin}
+import scala.build.input.{InputsComposer, ModuleInputs, OnDisk, Virtual, WorkspaceOrigin}
 import scala.build.internal.Constants
 import scala.build.internals.EnvVar
 import scala.build.options.{BuildOptions, Scope}
@@ -68,12 +67,12 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
 
   override def runCommand(options: SetupIdeOptions, args: RemainingArgs, logger: Logger): Unit = {
     val buildOptions = buildOptionsOrExit(options)
-    val inputs       = options.shared.inputs(args.all).orExit(logger)
-    CurrentParams.workspaceOpt = Some(inputs.workspace)
+    val moduleInputs = options.shared.composeInputs(args.all).orExit(logger)
+    CurrentParams.workspaceOpt = Some(moduleInputs.head.workspace)
 
     val bspPath = writeBspConfiguration(
       options,
-      inputs,
+      moduleInputs,
       buildOptions,
       previousCommandName = None,
       args = args.all
@@ -92,7 +91,7 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
   ): Unit =
     writeBspConfiguration(
       SetupIdeOptions(shared = options),
-      inputs,
+      Seq(inputs),
       buildOptions,
       previousCommandName,
       args
@@ -106,13 +105,13 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
 
   private def writeBspConfiguration(
     options: SetupIdeOptions,
-    inputs: ModuleInputs,
+    moduleInputs: Seq[ModuleInputs],
     buildOptions: BuildOptions,
     previousCommandName: Option[String],
     args: Seq[String]
   ): Either[BuildException, Option[os.Path]] = either {
 
-    val virtualInputs = inputs.elements.collect {
+    val virtualInputs = moduleInputs.flatMap(_.elements).collect {
       case v: Virtual => v
     }
     if (virtualInputs.nonEmpty)
@@ -125,23 +124,24 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
     val logger = options.shared.logger
 
     if (buildOptions.classPathOptions.allExtraDependencies.toSeq.nonEmpty)
-      value(downloadDeps(
-        inputs,
-        buildOptions,
-        logger
-      ))
-
-    val (bspName, bspJsonDestination) = bspDetails(inputs.workspace, options.bspFile)
-    val scalaCliBspJsonDestination =
-      inputs.workspace / Constants.workspaceDirName / "ide-options-v2.json"
-    val scalaCliBspLauncherOptsJsonDestination =
-      inputs.workspace / Constants.workspaceDirName / "ide-launcher-options.json"
-    val scalaCliBspInputsJsonDestination =
-      inputs.workspace / Constants.workspaceDirName / "ide-inputs.json"
-    val scalaCliBspEnvsJsonDestination =
-      inputs.workspace / Constants.workspaceDirName / "ide-envs.json"
-
-    val inputArgs = inputs.elements.collect { case d: OnDisk => d.path.toString }
+      for (module <- moduleInputs) do value(downloadDeps(module, buildOptions, logger))
+
+    val workspace = moduleInputs.head.workspace
+    
+    val (bspName, bspJsonDestination) = bspDetails(workspace, options.bspFile)
+    val scalaCliBspJsonDestination = workspace / Constants.workspaceDirName / "ide-options-v2.json"
+    val scalaCliBspLauncherOptsJsonDestination = workspace / Constants.workspaceDirName / "ide-launcher-options.json"
+    val scalaCliBspInputsJsonDestination = workspace / Constants.workspaceDirName / "ide-inputs.json"
+    val scalaCliBspEnvsJsonDestination = workspace / Constants.workspaceDirName / "ide-envs.json"
+
+    // FIXME single modules can also be defined with module config toml file
+    val inputArgs = if moduleInputs.size > 1 then
+      InputsComposer.findModuleConfig(args, Os.pwd)
+        .orExit(logger)
+        .fold(args)(p => Seq(p.toString))
+    else
+      moduleInputs.head.elements
+        .collect { case d: OnDisk => d.path.toString }
 
     val ideInputs = IdeInputs(
       options.shared.validateInputArgs(args)
@@ -189,7 +189,7 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
     val envsForBsp          = sys.env.filter((key, _) => EnvVar.allBsp.map(_.name).contains(key))
     val scalaCliBspEnvsJson = writeToArray(envsForBsp)
 
-    if (inputs.workspaceOrigin.contains(WorkspaceOrigin.HomeDir))
+    if (moduleInputs.head.workspaceOrigin.contains(WorkspaceOrigin.HomeDir))
       value(Left(new WorkspaceError(
         s"""$baseRunnerName can not determine where to write its BSP configuration.
            |Set an explicit BSP directory path via `--bsp-directory`.