Add ability to watch T.inputs and interp.watchValues

bsp/worker/src/mill/bsp/worker/Utils.scala

@@ -45,7 +45,7 @@ object Utils {
       results: Evaluator.Results,
       task: mill.define.Task[_]
   ): StatusCode = {
-    results.results(task) match {
+    results.results(task).result match {
       case Success(_) => StatusCode.OK
       case Skipped => StatusCode.CANCELLED
       case _ => StatusCode.ERROR

ci/mill-bootstrap.patch

@@ -1,5 +1,5 @@
 diff --git a/build.sc b/build.sc
-index 0f664c99c3..7d8788e7a8 100644
+index 0f664c99c3..d738fbe351 100644
 --- a/build.sc
 +++ b/build.sc
 @@ -19,17 +19,18 @@ import com.github.lolgab.mill.mima.{
@@ -518,7 +518,7 @@ index 0f664c99c3..7d8788e7a8 100644
      os.copy(examplePath, T.dest / exampleStr, createFolders = true)
      os.copy(bootstrapLauncher().path, T.dest / exampleStr / "mill")
      val zip = T.dest / s"$exampleStr.zip"
-@@ -2018,47 +1735,6 @@ def exampleZips: Target[Seq[PathRef]] = T {
+@@ -2018,51 +1735,10 @@ def exampleZips: Target[Seq[PathRef]] = T {
  }
 
  def uploadToGithub(authKey: String) = T.command {
@@ -566,3 +566,18 @@ index 0f664c99c3..7d8788e7a8 100644
  }
 
  def validate(ev: Evaluator): Command[Unit] = T.command {
+-  T.task(MainModule.evaluateTasks(
++  mill.main.RunScript.evaluateTasksNamed(
+     ev.withFailFast(false),
+     Seq(
+       "__.compile",
+@@ -2075,7 +1751,8 @@ def validate(ev: Evaluator): Command[Unit] = T.command {
+       "docs.localPages"
+     ),
+     selectMode = SelectMode.Separated
+-  )(identity))()
++  )
++
+   ()
+ }
+

example/src/mill/integration/ExampleTestSuite.scala

@@ -88,7 +88,7 @@ object ExampleTestSuite extends IntegrationTestSuite {
     BashTokenizer.tokenize(commandStr) match {
       case Seq(s"./$command", rest @ _*) =>
         val evalResult = command match {
-          case "mill" => evalStdout(rest: _*)
+          case "mill" => evalStdout(rest)
           case cmd =>
             val tokens = cmd +: rest
             val executable = workspaceRoot / os.RelPath(tokens.head)

example/tasks/2-primary-tasks/build.sc

@@ -34,10 +34,10 @@ def lineCount: T[Int] = T {
 
 > ./mill show lineCount
 Computing line count
-18
+16
 
 > ./mill show lineCount # line count already cached, doesn't need to be computed
-18
+16
 
 */
 
@@ -111,7 +111,7 @@ def hugeFileName = T{
 /** Usage
 
 > ./mill show lineCount
-18
+16
 
 > ./mill show hugeFileName # This still runs `largestFile` even though `lineCount() < 999`
 Finding Largest File

example/tasks/2-primary-tasks/src/Foo.java

@@ -13,6 +13,4 @@ public static void main(String[] args) throws IOException{
             System.out.println("foo.txt resource: " + br.readLine());
         }
     }
-
-
 }

integration/feature/editing/test/src/MultiLevelBuildTests.scala

@@ -58,7 +58,7 @@ object MultiLevelBuildTests extends IntegrationTestSuite {
      */
     def checkWatchedFiles(expected0: Seq[os.Path]*) = {
       for ((expectedWatched0, (frame, path)) <- expected0.zip(loadFrames(expected0.length))) {
-        val frameWatched = frame.evalWatched.map(_.path).sorted
+        val frameWatched = frame.evalWatched.map(_.path).sorted.filter(_.startsWith(wsRoot))
         val expectedWatched = expectedWatched0.sorted
         assert(frameWatched == expectedWatched)
       }

integration/feature/watch-source-input/repo/bar.txt

@@ -0,0 +1 @@
+initial-bar

integration/feature/watch-source-input/repo/baz.txt

@@ -0,0 +1 @@
+initial-baz

integration/feature/watch-source-input/repo/build.sc

@@ -0,0 +1,47 @@
+import mill._
+
+println("Setting up build.sc")
+
+def foo = T.sources(millSourcePath / "foo1.txt", millSourcePath / "foo2.txt")
+def bar = T.source(millSourcePath / "bar.txt")
+
+def qux = T{
+  val fooMsg = "Running qux foo contents " + foo().map(p => os.read(p.path)).mkString(" ")
+  println(fooMsg)
+
+  val barMsg = "Running qux bar contents " + os.read(bar().path)
+  println(barMsg)
+
+  writeCompletionMarker("quxRan")
+
+  fooMsg + " " + barMsg
+}
+
+interp.watchValue(PathRef(millSourcePath / "watchValue.txt"))
+
+def baz = T.input(PathRef(millSourcePath / "baz.txt"))
+
+def lol = T{
+  val barMsg = "Running lol baz contents " + os.read(baz().path)
+  println(barMsg)
+
+  writeCompletionMarker("lolRan")
+
+  barMsg
+}
+
+
+def writeCompletionMarker(name: String) = {
+
+  Range(0, 10)
+    .map(i => os.pwd / "out" / s"$name$i")
+    .find(!os.exists(_))
+    .foreach(os.write(_, ""))
+}
+
+writeCompletionMarker("initialized")
+
+if (os.read(millSourcePath / "watchValue.txt").contains("exit")){
+  Thread.sleep(1000)
+  System.exit(0)
+}

integration/feature/watch-source-input/repo/foo1.txt

@@ -0,0 +1 @@
+initial-foo1

integration/feature/watch-source-input/repo/foo2.txt

@@ -0,0 +1 @@
+initial-foo2

integration/feature/watch-source-input/repo/watchValue.txt

@@ -0,0 +1 @@
+initial-watchValue2

integration/feature/watch-source-input/test/src/WatchSourceInputTests.scala

@@ -0,0 +1,153 @@
+package mill.integration
+
+import utest._
+import scala.concurrent.{Await, Future}
+import scala.concurrent.duration.Duration
+import scala.concurrent.duration.SECONDS
+import scala.concurrent.ExecutionContext.Implicits.global
+
+/**
+ * Test to make sure that `--watch` works in the following cases:
+ *
+ * 1. `T.source`
+ * 2. `T.sources`
+ * 3. `T.input`
+ * 4. `interp.watchValue`
+ * 5. Implicitly watched files, like `build.sc`
+ */
+object WatchSourceInputTests extends IntegrationTestSuite {
+
+  val maxDuration = 30000
+  val tests = Tests {
+    val wsRoot = initWorkspace()
+
+    def awaitCompletionMarker(name: String) = {
+      val maxTime = System.currentTimeMillis() + maxDuration
+      while (!os.exists(wsRoot / "out" / name)) {
+        if (System.currentTimeMillis() > maxTime) {
+          sys.error(s"awaitCompletionMarker($name) timed out")
+        }
+        Thread.sleep(100)
+      }
+    }
+
+    def testWatchSource(show: Boolean) = {
+      val showArgs = if (show) Seq("show") else Nil
+
+      val evalResult = Future { evalTimeoutStdout(maxDuration, "--watch", showArgs, "qux") }
+      val expectedPrints = collection.mutable.Buffer.empty[String]
+      val expectedShows = collection.mutable.Buffer.empty[String]
+
+      awaitCompletionMarker("initialized0")
+      awaitCompletionMarker("quxRan0")
+      expectedPrints.append(
+        "Setting up build.sc",
+        "Running qux foo contents initial-foo1 initial-foo2",
+        "Running qux bar contents initial-bar"
+      )
+      expectedShows.append(
+        "Running qux foo contents initial-foo1 initial-foo2 Running qux bar contents initial-bar"
+      )
+
+      os.write.over(wsRoot / "foo1.txt", "edited-foo1")
+      awaitCompletionMarker("quxRan1")
+      expectedPrints.append(
+        "Running qux foo contents edited-foo1 initial-foo2",
+        "Running qux bar contents initial-bar"
+      )
+      expectedShows.append(
+        "Running qux foo contents edited-foo1 initial-foo2 Running qux bar contents initial-bar"
+      )
+
+      os.write.over(wsRoot / "foo2.txt", "edited-foo2")
+      awaitCompletionMarker("quxRan2")
+      expectedPrints.append(
+        "Running qux foo contents edited-foo1 edited-foo2",
+        "Running qux bar contents initial-bar"
+      )
+      expectedShows.append(
+        "Running qux foo contents edited-foo1 edited-foo2 Running qux bar contents initial-bar"
+      )
+
+      os.write.over(wsRoot / "bar.txt", "edited-bar")
+      awaitCompletionMarker("quxRan3")
+      expectedPrints.append(
+        "Running qux foo contents edited-foo1 edited-foo2",
+        "Running qux bar contents edited-bar"
+      )
+      expectedShows.append(
+        "Running qux foo contents edited-foo1 edited-foo2 Running qux bar contents edited-bar"
+      )
+
+      os.write.append(wsRoot / "build.sc", "\ndef unrelated = true")
+      awaitCompletionMarker("initialized1")
+      expectedPrints.append(
+        "Setting up build.sc",
+        "Running qux foo contents edited-foo1 edited-foo2",
+        "Running qux bar contents edited-bar"
+      )
+      expectedShows.append(
+        "Running qux foo contents edited-foo1 edited-foo2 Running qux bar contents edited-bar"
+      )
+
+      os.write.over(wsRoot / "watchValue.txt", "exit")
+      awaitCompletionMarker("initialized2")
+      expectedPrints.append("Setting up build.sc")
+
+      val res = Await.result(evalResult, Duration.apply(maxDuration, SECONDS))
+
+      val (shows, prints) = res.out.linesIterator.toVector.partition(_.startsWith("\""))
+
+      assert(prints == expectedPrints)
+      if (show) assert(shows == expectedShows.map('"' + _ + '"'))
+    }
+
+    test("sources") {
+
+      test("noshow") - testWatchSource(false)
+      test("show") - testWatchSource(true)
+    }
+
+    def testWatchInput(show: Boolean) = {
+      val showArgs = if (show) Seq("show") else Nil
+
+      val evalResult = Future { evalTimeoutStdout(maxDuration, "--watch", showArgs, "lol") }
+      val expectedPrints = collection.mutable.Buffer.empty[String]
+      val expectedShows = collection.mutable.Buffer.empty[String]
+
+      awaitCompletionMarker("initialized0")
+      awaitCompletionMarker("lolRan0")
+      expectedPrints.append(
+        "Setting up build.sc",
+        "Running lol baz contents initial-baz"
+      )
+      expectedShows.append("Running lol baz contents initial-baz")
+
+      os.write.over(wsRoot / "baz.txt", "edited-baz")
+      awaitCompletionMarker("lolRan1")
+      expectedPrints.append("Running lol baz contents edited-baz")
+      expectedShows.append("Running lol baz contents edited-baz")
+
+      os.write.over(wsRoot / "watchValue.txt", "edited-watchValue")
+      awaitCompletionMarker("initialized1")
+      expectedPrints.append("Setting up build.sc")
+      expectedShows.append("Running lol baz contents edited-baz")
+
+      os.write.over(wsRoot / "watchValue.txt", "exit")
+      awaitCompletionMarker("initialized2")
+      expectedPrints.append("Setting up build.sc")
+
+      val res = Await.result(evalResult, Duration.apply(maxDuration, SECONDS))
+
+      val (shows, prints) = res.out.linesIterator.toVector.partition(_.startsWith("\""))
+      assert(prints == expectedPrints)
+      if (show) assert(shows == expectedShows.map('"' + _ + '"'))
+    }
+
+    test("input") {
+
+      test("noshow") - testWatchInput(false)
+      test("show") - testWatchInput(true)
+    }
+  }
+}

integration/src/mill/integration/IntegrationTestSuite.scala

@@ -1,21 +1,14 @@
 package mill.integration
 
-import mainargs.Flag
-import mill.runner.MillCliConfig
 import mill.main.SelectMode
-import mill.runner.{MillBuildBootstrap, MillMain, RunnerState, Watching}
-import mill.api.SystemStreams
-import mill.util.PrintLogger
-import os.Path
+import mill.runner.RunnerState
+import os.{Path, Shellable}
 import utest._
 
-import java.io.{ByteArrayInputStream, ByteArrayOutputStream, PrintStream}
-import java.nio.file.NoSuchFileException
 import scala.util.control.NonFatal
 
 object IntegrationTestSuite {
   case class EvalResult(isSuccess: Boolean, out: String, err: String)
-
 }
 
 abstract class IntegrationTestSuite extends TestSuite {
@@ -37,16 +30,20 @@ abstract class IntegrationTestSuite extends TestSuite {
 
   var runnerState = RunnerState.empty
 
-  def eval(s: String*): Boolean = evalFork(os.Inherit, os.Inherit, s)
+  def eval(s: Shellable*): Boolean = evalFork(os.Inherit, os.Inherit, s, -1)
+
+  def evalStdout(s: Shellable*): IntegrationTestSuite.EvalResult = {
+    evalTimeoutStdout(-1, s: _*)
+  }
 
-  def evalStdout(s: String*): IntegrationTestSuite.EvalResult = {
+  def evalTimeoutStdout(timeout: Long, s: Shellable*): IntegrationTestSuite.EvalResult = {
 
     val output = Seq.newBuilder[String]
     val error = Seq.newBuilder[String]
     val processOutput = os.ProcessOutput.Readlines(output += _)
     val processError = os.ProcessOutput.Readlines(error += _)
 
-    val result = evalFork(processOutput, processError, s)
+    val result = evalFork(processOutput, processError, s, timeout)
     IntegrationTestSuite.EvalResult(
       result,
       output.result().mkString("\n"),
@@ -61,7 +58,8 @@ abstract class IntegrationTestSuite extends TestSuite {
   private def evalFork(
       stdout: os.ProcessOutput,
       stderr: os.ProcessOutput,
-      s: Seq[String]
+      s: Seq[Shellable],
+      timeout: Long
   ): Boolean = {
     val serverArgs =
       if (integrationTestMode == "server" || integrationTestMode == "local") Seq()
@@ -75,7 +73,8 @@ abstract class IntegrationTestSuite extends TestSuite {
         stdin = os.Inherit,
         stdout = stdout,
         stderr = stderr,
-        env = millTestSuiteEnv
+        env = millTestSuiteEnv,
+        timeout = timeout
       )
       true
     } catch {

main/api/src/mill/api/Val.scala

@@ -0,0 +1,10 @@
+package mill.api
+
+/**
+ * A somewhat-type-safe wrapper around `Any`. Stores an un-typed value, but
+ * can only be created explicitly by wrapping in `Val(_)` and de-constructed
+ * explicitly via `.value`. That makes it much less likely to introduce bugs
+ * passing the wrong thing, e.g. `(Any, Int)` can be passed to `Any`, but
+ * `(Val, Int)` cannot be passed to `Val`
+ */
+case class Val(value: Any)