Merge pull request #618 from alexarchambault/tweaking

Tweaking

Author: romanowski

.scalafmt.conf

@@ -46,7 +46,9 @@ fileOverride {
   }
 }
 project.excludeFilters = [
+  ".bloop"
   ".metals"
+  ".scala-build"
   "examples" # Scala 3 scripts and using directives not supported yet
   "out"
   "scala-version.scala"

build.sc

@@ -233,13 +233,16 @@ class Build(val crossScalaVersion: String)
         """ !sv.startsWith("2.") """
       else
         "false"
+    val detailedVersionValue =
+      if (`local-repo`.developingOnStubModules) s"""Some("${vcsState()}")"""
+      else "None"
     val code =
       s"""package scala.build.internal
          |
          |/** Build-time constants. Generated by mill. */
          |object Constants {
          |  def version = "${publishVersion()}"
-         |  def detailedVersion = "${vcsState()}"
+         |  def detailedVersion: Option[String] = $detailedVersionValue
          |
          |  def scalaJsVersion = "${Deps.scalaJsLinker.dep.version}"
          |  def scalaNativeVersion = "${Deps.nativeTools.dep.version}"
@@ -613,6 +616,14 @@ class TastyLib(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
 }
 
 object `local-repo` extends LocalRepo {
+
+  /*
+   * If you are developing locally on any of the stub modules (stubs, runner, test-runner),
+   * set this to true, so that Mill's watch mode takes into account changes in those modules
+   * when embedding their JARs in the Scala CLI launcher.
+   */
+  def developingOnStubModules = false
+
   def stubsModules = {
     val javaModules = Seq(
       stubs

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

@@ -68,7 +68,8 @@ object Build {
         else
           Left(
             new SeveralMainClassesFoundError(
-              ::(foundMainClasses0.head, foundMainClasses0.tail.toList)
+              ::(foundMainClasses0.head, foundMainClasses0.tail.toList),
+              Nil
             )
           )
 
@@ -206,7 +207,6 @@ object Build {
           val res = build(
             inputs0,
             sources0,
-            inputs0.generatedSrcRoot(scope),
             generatedSources,
             options,
             scope,
@@ -298,7 +298,6 @@ object Build {
   private def build(
     inputs: Inputs,
     sources: Sources,
-    generatedSrcRoot0: os.Path,
     generatedSources: Seq[GeneratedSource],
     options: BuildOptions,
     scope: Scope,
@@ -311,7 +310,6 @@ object Build {
       buildOnce(
         inputs,
         sources,
-        generatedSrcRoot0,
         generatedSources,
         options,
         scope,
@@ -732,7 +730,6 @@ object Build {
   def buildOnce(
     inputs: Inputs,
     sources: Sources,
-    generatedSrcRoot0: os.Path,
     generatedSources: Seq[GeneratedSource],
     options0: BuildOptions,
     scope: Scope,

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

@@ -156,7 +156,6 @@ final class BspImpl(
       Build.buildOnce(
         inputs,
         data.sources,
-        inputs.generatedSrcRoot(scope),
         data.generatedSources,
         data.buildOptions,
         scope,

modules/build/src/main/scala/scala/build/errors/MainClassError.scala

@@ -1,3 +1,8 @@
 package scala.build.errors
 
-abstract class MainClassError(message: String) extends BuildException(message)
+import scala.build.Position
+
+abstract class MainClassError(
+  message: String,
+  positions: Seq[Position]
+) extends BuildException(message, positions = positions)

modules/build/src/main/scala/scala/build/errors/MalformedDirectiveError.scala

@@ -0,0 +1,6 @@
+package scala.build.errors
+
+import scala.build.Position
+
+final class MalformedDirectiveError(message: String, positions: Seq[Position])
+    extends BuildException(message, positions)

modules/build/src/main/scala/scala/build/errors/NoMainClassFoundError.scala

@@ -1,3 +1,3 @@
 package scala.build.errors
 
-final class NoMainClassFoundError extends MainClassError("No main class found")
+final class NoMainClassFoundError extends MainClassError("No main class found", Nil)

modules/build/src/main/scala/scala/build/errors/NoValueProvidedError.scala

@@ -0,0 +1,12 @@
+package scala.build.errors
+
+import scala.build.preprocessing.directives.StrictDirective
+
+final class NoValueProvidedError(
+  val directive: StrictDirective
+) extends BuildException(
+      s"Expected a value for directive ${directive.key}",
+      positions = Nil // I wish using_directives provided the key position…
+    ) {
+  assert(directive.numericalOrStringValuesCount == 0)
+}

modules/build/src/main/scala/scala/build/errors/SeveralMainClassesFoundError.scala

@@ -1,4 +1,11 @@
 package scala.build.errors
 
-final class SeveralMainClassesFoundError(mainClasses: ::[String])
-    extends MainClassError(s"Found several main classes: ${mainClasses.mkString(", ")}")
+import scala.build.Position
+
+final class SeveralMainClassesFoundError(
+  mainClasses: ::[String],
+  positions: Seq[Position]
+) extends MainClassError(
+      s"Found several main classes: ${mainClasses.mkString(", ")}",
+      positions = positions
+    )

modules/build/src/main/scala/scala/build/errors/SingleValueExpectedError.scala

@@ -0,0 +1,14 @@
+package scala.build.errors
+
+import scala.build.preprocessing.directives.{DirectiveUtil, StrictDirective}
+
+final class SingleValueExpectedError(
+  val directive: StrictDirective,
+  val path: Either[String, os.Path]
+) extends BuildException(
+      s"Expected a single value for directive ${directive.key} " +
+        s"(got ${directive.values.length} values: ${directive.values.map(_.get().toString).mkString(", ")})",
+      positions = DirectiveUtil.positions(directive.values, path)
+    ) {
+  assert(directive.numericalOrStringValuesCount > 1)
+}