Fix count project name - Include sources from using directive to inpu…

…ts elements -
VirtusLab · Jul 12, 2022 · 266cae0 · 266cae0
1 parent 8543bda
commit 266cae0
Showing 1 changed file with 23 additions and 5 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/commands/Bsp.scala b/modules/cli/src/main/scala/scala/cli/commands/Bsp.scala
@@ -4,8 +4,9 @@ import caseapp._
 import com.github.plokhotnyuk.jsoniter_scala.core._
 
 import scala.build.bsp.{BspReloadableOptions, BspThreads}
-import scala.build.options.BuildOptions
-import scala.build.{Build, Inputs}
+import scala.build.internal.CustomCodeWrapper
+import scala.build.options.{BuildOptions, Scope}
+import scala.build.{Build, CrossSources, Inputs, PersistentDiagnosticLogger, Sources}
 import scala.cli.CurrentParams
 import scala.cli.commands.util.CommonOps._
 import scala.cli.commands.util.SharedOptionsUtil._
@@ -29,10 +30,27 @@ object Bsp extends ScalaCommand[BspOptions] {
       argsSeq => {
         val sharedOptions = getSharedOptions()
         sharedOptions.inputs(argsSeq, () => Inputs.default())
-          .map { i =>
+          .map { initialInputs =>
             if (sharedOptions.logging.verbosity >= 3)
-              pprint.err.log(i)
-            Build.updateInputs(i, buildOptions(sharedOptions))
+              pprint.err.log(initialInputs)
+
+            val buildOptions0    = buildOptions(sharedOptions)
+            val logger           = sharedOptions.logging.logger
+            val persistentLogger = new PersistentDiagnosticLogger(logger)
+
+            val allInputs: Inputs =
+              CrossSources.forInputs(
+                initialInputs,
+                Sources.defaultPreprocessors(
+                  buildOptions0.scriptOptions.codeWrapper.getOrElse(CustomCodeWrapper),
+                  buildOptions0.archiveCache,
+                  buildOptions0.internal.javaClassNameVersionOpt
+                ),
+                persistentLogger
+              ).left.map((_, Scope.Main))
+                .map(_._2).getOrElse(initialInputs)
+
+            Build.updateInputs(allInputs, buildOptions(sharedOptions))
           }
       }