Rename Inputs to ModuleInputs

Author: MaciejG604

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

@@ -30,7 +30,7 @@ import scala.util.control.NonFatal
 import scala.util.{Properties, Try}
 
 trait Build {
-  def inputs: Inputs
+  def inputs: ModuleInputs
   def options: BuildOptions
   def scope: Scope
   def outputOpt: Option[os.Path]
@@ -43,7 +43,7 @@ trait Build {
 object Build {
 
   final case class Successful(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     options: BuildOptions,
     scalaParams: Option[ScalaParameters],
     scope: Scope,
@@ -166,7 +166,7 @@ object Build {
   }
 
   final case class Failed(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     options: BuildOptions,
     scope: Scope,
     sources: Sources,
@@ -180,7 +180,7 @@ object Build {
   }
 
   final case class Cancelled(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     options: BuildOptions,
     scope: Scope,
     reason: String
@@ -195,10 +195,10 @@ object Build {
     * Using only the command-line options not the ones from the sources.
     */
   def updateInputs(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     options: BuildOptions,
     testOptions: Option[BuildOptions] = None
-  ): Inputs = {
+  ): ModuleInputs = {
 
     // If some options are manually overridden, append a hash of the options to the project name
     // Using options, not options0 - only the command-line options are taken into account. No hash is
@@ -215,7 +215,7 @@ object Build {
   }
 
   private def allInputs(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     options: BuildOptions,
     logger: Logger
   )(using ScalaCliInvokeData) =
@@ -232,7 +232,7 @@ object Build {
     )
 
   private def build(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     crossSources: CrossSources,
     options: BuildOptions,
     logger: Logger,
@@ -247,7 +247,7 @@ object Build {
     val sharedOptions = crossSources.sharedOptions(options)
     val crossOptions  = sharedOptions.crossOptions
 
-    def doPostProcess(build: Build, inputs: Inputs, scope: Scope): Unit = build match {
+    def doPostProcess(build: Build, inputs: ModuleInputs, scope: Scope): Unit = build match {
       case build: Build.Successful =>
         for (sv <- build.project.scalaCompiler.map(_.scalaVersion))
           postProcess(
@@ -426,7 +426,7 @@ object Build {
   }
 
   private def build(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     sources: Sources,
     generatedSources: Seq[GeneratedSource],
     options: BuildOptions,
@@ -499,7 +499,7 @@ object Build {
 
   def scalaNativeSupported(
     options: BuildOptions,
-    inputs: Inputs,
+    inputs: ModuleInputs,
     logger: Logger
   ): Either[BuildException, Option[ScalaNativeCompatibilityError]] =
     either {
@@ -557,7 +557,7 @@ object Build {
     }
 
   def build(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     options: BuildOptions,
     compilerMaker: ScalaCompilerMaker,
     docCompilerMakerOpt: Option[ScalaCompilerMaker],
@@ -637,7 +637,7 @@ object Build {
   }
 
   def watch(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     options: BuildOptions,
     compilerMaker: ScalaCompilerMaker,
     docCompilerMakerOpt: Option[ScalaCompilerMaker],
@@ -841,7 +841,7 @@ object Build {
     *   a bloop [[Project]]
     */
   def buildProject(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     sources: Sources,
     generatedSources: Seq[GeneratedSource],
     options: BuildOptions,
@@ -1021,7 +1021,7 @@ object Build {
   }
 
   def prepareBuild(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     sources: Sources,
     generatedSources: Seq[GeneratedSource],
     options: BuildOptions,
@@ -1102,7 +1102,7 @@ object Build {
     }
 
   def buildOnce(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     sources: Sources,
     generatedSources: Seq[GeneratedSource],
     options: BuildOptions,
@@ -1272,7 +1272,7 @@ object Build {
     else path.toString
 
   private def jmhBuild(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     build: Build.Successful,
     logger: Logger,
     javaCommand: String,

modules/build/src/main/scala/scala/build/CrossSources.scala

@@ -140,7 +140,7 @@ final case class CrossSources(
 
 object CrossSources {
 
-  private def withinTestSubDirectory(p: ScopePath, inputs: Inputs): Boolean =
+  private def withinTestSubDirectory(p: ScopePath, inputs: ModuleInputs): Boolean =
     p.root.exists { path =>
       val fullPath = path / p.subPath
       inputs.elements.exists {
@@ -155,14 +155,14 @@ object CrossSources {
   /** @return
     *   a CrossSources and Inputs which contains element processed from using directives
     */
-  def forInputs(
-    inputs: Inputs,
+  def forModuleInputs(
+    inputs: ModuleInputs,
     preprocessors: Seq[Preprocessor],
     logger: Logger,
     suppressWarningOptions: SuppressWarningOptions,
     exclude: Seq[Positioned[String]] = Nil,
     maybeRecoverOnError: BuildException => Option[BuildException] = e => Some(e)
-  )(using ScalaCliInvokeData): Either[BuildException, (CrossSources, Inputs)] = either {
+  )(using ScalaCliInvokeData): Either[BuildException, (CrossSources, ModuleInputs)] = either {
 
     def preprocessSources(elems: Seq[SingleElement])
       : Either[BuildException, Seq[PreprocessedSource]] =
@@ -379,7 +379,7 @@ object CrossSources {
     *   the resource directories that should be added to the classpath
     */
   private def resolveResourceDirs(
-    allInputs: Inputs,
+    allInputs: ModuleInputs,
     preprocessedSources: Seq[PreprocessedSource]
   ): Seq[WithBuildRequirements[os.Path]] = {
     val fromInputs = allInputs.elements

modules/build/src/main/scala/scala/build/Sources.scala

@@ -6,7 +6,7 @@ import coursier.util.Task
 import java.nio.charset.StandardCharsets
 
 import scala.build.info.BuildInfo
-import scala.build.input.Inputs
+import scala.build.input.ModuleInputs
 import scala.build.internal.{CodeWrapper, WrapperParams}
 import scala.build.options.{BuildOptions, Scope}
 import scala.build.preprocessing.*
@@ -19,7 +19,7 @@ final case class Sources(
   buildOptions: BuildOptions
 ) {
 
-  def withVirtualDir(inputs: Inputs, scope: Scope, options: BuildOptions): Sources = {
+  def withVirtualDir(inputs: ModuleInputs, scope: Scope, options: BuildOptions): Sources = {
 
     val srcRootPath = inputs.generatedSrcRoot(scope)
     val resourceDirs0 = options.classPathOptions.resourcesVirtualDir.map { path =>

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

@@ -6,10 +6,10 @@ import java.util.concurrent.atomic.AtomicReference
 
 import scala.build.Build
 import scala.build.compiler.BloopCompiler
-import scala.build.input.{Inputs, OnDisk, SingleFile, Virtual}
+import scala.build.input.{ModuleInputs, OnDisk, SingleFile, Virtual}
 
 final class BloopSession(
-  val inputs: Inputs,
+  val inputs: ModuleInputs,
   val inputsHash: String,
   val remoteServer: BloopCompiler,
   val bspServer: BspServer,
@@ -57,7 +57,7 @@ final class BloopSession(
 object BloopSession {
 
   def apply(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     remoteServer: BloopCompiler,
     bspServer: BspServer,
     watcher: Build.Watcher

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

@@ -3,17 +3,17 @@ package scala.build.bsp
 import java.io.{InputStream, OutputStream}
 
 import scala.build.errors.BuildException
-import scala.build.input.{Inputs, ScalaCliInvokeData}
+import scala.build.input.{ModuleInputs, ScalaCliInvokeData}
 import scala.concurrent.Future
 
 trait Bsp {
-  def run(initialInputs: Inputs, initialBspOptions: BspReloadableOptions): Future[Unit]
+  def run(initialInputs: ModuleInputs, initialBspOptions: BspReloadableOptions): Future[Unit]
   def shutdown(): Unit
 }
 
 object Bsp {
   def create(
-    argsToInputs: Seq[String] => Either[BuildException, Inputs],
+    argsToInputs: Seq[String] => Either[BuildException, ModuleInputs],
     bspReloadableOptionsReference: BspReloadableOptions.Reference,
     threads: BspThreads,
     in: InputStream,

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

@@ -21,7 +21,7 @@ import scala.build.errors.{
   Diagnostic,
   ParsingInputsException
 }
-import scala.build.input.{Inputs, ScalaCliInvokeData}
+import scala.build.input.{ModuleInputs, ScalaCliInvokeData}
 import scala.build.internal.Constants
 import scala.build.options.{BuildOptions, Scope}
 import scala.collection.mutable.ListBuffer
@@ -33,7 +33,7 @@ import scala.util.{Failure, Success}
 /** The implementation for [[Bsp]] command.
   *
   * @param argsToInputs
-  *   a function transforming terminal args to [[Inputs]]
+  *   a function transforming terminal args to [[ModuleInputs]]
   * @param bspReloadableOptionsReference
   *   reference to the current instance of [[BspReloadableOptions]]
   * @param threads
@@ -44,7 +44,7 @@ import scala.util.{Failure, Success}
   *   the output stream of bytes
   */
 final class BspImpl(
-  argsToInputs: Seq[String] => Either[BuildException, Inputs],
+  argsToInputs: Seq[String] => Either[BuildException, ModuleInputs],
   bspReloadableOptionsReference: BspReloadableOptions.Reference,
   threads: BspThreads,
   in: InputStream,
@@ -108,7 +108,7 @@ final class BspImpl(
 
       // allInputs contains elements from using directives
       val (crossSources, allInputs) = value {
-        CrossSources.forInputs(
+        CrossSources.forModuleInputs(
           inputs = inputs,
           preprocessors = Sources.defaultPreprocessors(
             buildOptions.archiveCache,
@@ -408,7 +408,7 @@ final class BspImpl(
     *   a new [[BloopSession]]
     */
   private def newBloopSession(
-    inputs: Inputs,
+    inputs: ModuleInputs,
     reloadableOptions: BspReloadableOptions,
     presetIntelliJ: Boolean = false
   ): BloopSession = {
@@ -459,7 +459,10 @@ final class BspImpl(
     *   the initial input sources passed upon initializing the BSP connection (which are subject to
     *   change on subsequent workspace/reload requests)
     */
-  override def run(initialInputs: Inputs, initialBspOptions: BspReloadableOptions): Future[Unit] = {
+  override def run(
+    initialInputs: ModuleInputs,
+    initialBspOptions: BspReloadableOptions
+  ): Future[Unit] = {
     val logger    = initialBspOptions.logger
     val verbosity = initialBspOptions.verbosity
 
@@ -561,8 +564,8 @@ final class BspImpl(
     */
   private def reloadBsp(
     currentBloopSession: BloopSession,
-    previousInputs: Inputs,
-    newInputs: Inputs,
+    previousInputs: ModuleInputs,
+    newInputs: ModuleInputs,
     reloadableOptions: BspReloadableOptions
   ): CompletableFuture[AnyRef] = {
     val previousTargetIds = currentBloopSession.bspServer.targetIds

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

@@ -6,7 +6,7 @@ import java.util.concurrent.CompletableFuture
 
 import scala.build.GeneratedSource
 import scala.build.bsp.buildtargets.{ManagesBuildTargets, ProjectName}
-import scala.build.input.Inputs
+import scala.build.input.ModuleInputs
 import scala.build.options.Scope
 
 /** A wrapper for [[BspServer]], allowing to reload the workspace on the fly.
@@ -113,6 +113,6 @@ class BuildServerProxy(
     bspServer().addTarget(projectName, workspace, scope, generatedSources)
   def resetTargets(): Unit =
     bspServer().resetTargets()
-  def newInputs(inputs: Inputs): Unit =
+  def newInputs(inputs: ModuleInputs): Unit =
     bspServer().newInputs(inputs)
 }

modules/build/src/main/scala/scala/build/bsp/buildtargets/ManagesBuildTargets.scala

@@ -4,7 +4,7 @@ import ch.epfl.scala.bsp4j.BuildTargetIdentifier
 import ch.epfl.scala.bsp4j as b
 
 import scala.build.GeneratedSource
-import scala.build.input.Inputs
+import scala.build.input.ModuleInputs
 import scala.build.internal.Constants
 import scala.build.options.Scope
 
@@ -18,7 +18,7 @@ trait ManagesBuildTargets {
     generatedSources: Seq[GeneratedSource] = Nil
   ): Unit
   def resetTargets(): Unit
-  def newInputs(inputs: Inputs): Unit
+  def newInputs(inputs: ModuleInputs): Unit
   def setGeneratedSources(projectName: ProjectName, sources: Seq[GeneratedSource]): Unit
 }
 

modules/build/src/main/scala/scala/build/bsp/buildtargets/ManagesBuildTargetsImpl.scala

@@ -5,7 +5,7 @@ import ch.epfl.scala.bsp4j as b
 import scala.build.GeneratedSource
 import scala.build.bsp.buildtargets.ManagesBuildTargets
 import scala.build.errors.{BuildException, WorkspaceError}
-import scala.build.input.Inputs
+import scala.build.input.ModuleInputs
 import scala.build.internal.Constants
 import scala.build.options.Scope
 import scala.collection.mutable
@@ -35,7 +35,7 @@ trait ManagesBuildTargetsImpl extends ManagesBuildTargets {
     managedTargets.put(projectName, BuildTarget(projectName, workspace, scope, generatedSources))
 
   // TODO MG
-  override def newInputs(inputs: Inputs): Unit = {
+  override def newInputs(inputs: ModuleInputs): Unit = {
     resetTargets()
     addTarget(inputs.projectName, inputs.workspace, Scope.Main)
     addTarget(inputs.scopeProjectName(Scope.Test), inputs.workspace, Scope.Test)