.

com-lihaoyi · Oct 11, 2024 · cc5c735 · cc5c735
1 parent 365635e
commit cc5c735
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/main/eval/src/mill/eval/EvaluatorImpl.scala b/main/eval/src/mill/eval/EvaluatorImpl.scala
@@ -64,6 +64,10 @@ private[mill] case class EvaluatorImpl(
   override def evalOrThrow(exceptionFactory: Evaluator.Results => Throwable)
       : Evaluator.EvalOrThrow =
     new EvalOrThrow(this, exceptionFactory)
+
+  override def withEvaluator[T](t: => T): T = {
+    mill.eval.Evaluator.currentEvaluator.withValue(this) { t }
+  }
 }
 
 private[mill] object EvaluatorImpl {

diff --git a/main/eval/src/mill/eval/GroupEvaluator.scala b/main/eval/src/mill/eval/GroupEvaluator.scala
@@ -18,6 +18,7 @@ import scala.util.hashing.MurmurHash3
  * with a single [[Terminal]].
  */
 private[mill] trait GroupEvaluator {
+  def withEvaluator[T](t: => T): T
   def home: os.Path
   def workspace: os.Path
   def outPath: os.Path
@@ -296,10 +297,11 @@ private[mill] trait GroupEvaluator {
 
               os.dynamicPwdFunction.withValue(destFunc) {
                 SystemStreams.withStreams(streams) {
-                  if (exclusive) {
+                  if (!exclusive) t
+                  else {
                     logger.reportKey(Seq(counterMsg))
-                    logger.withPromptPaused { t }
-                  } else t
+                    withEvaluator { logger.withPromptPaused { t } }
+                  }
                 }
               }
             }

diff --git a/main/src/mill/main/RunScript.scala b/main/src/mill/main/RunScript.scala
@@ -20,14 +20,13 @@ object RunScript {
     String,
     (Seq[Watchable], Either[String, Seq[(Any, Option[(TaskName, ujson.Value)])]])
   ] = {
-    val resolved = mill.eval.Evaluator.currentEvaluator.withValue(evaluator) {
-      Resolve.Tasks.resolve(
-        evaluator.rootModule,
-        scriptArgs,
-        selectMode,
-        evaluator.allowPositionalCommandArgs
-      )
-    }
+    val resolved = Resolve.Tasks.resolve(
+      evaluator.rootModule,
+      scriptArgs,
+      selectMode,
+      evaluator.allowPositionalCommandArgs
+    )
+
     for (targets <- resolved) yield evaluateNamed(evaluator, Agg.from(targets))
   }
 

diff --git a/testkit/src/mill/testkit/UnitTester.scala b/testkit/src/mill/testkit/UnitTester.scala
@@ -106,9 +106,7 @@ class UnitTester(
   )
 
   def apply(args: String*): Either[Result.Failing[_], UnitTester.Result[Seq[_]]] = {
-    mill.eval.Evaluator.currentEvaluator.withValue(evaluator) {
-      Resolve.Tasks.resolve(evaluator.rootModule, args, SelectMode.Separated)
-    } match {
+    Resolve.Tasks.resolve(evaluator.rootModule, args, SelectMode.Separated) match {
       case Left(err) => Left(Result.Failure(err))
       case Right(resolved) => apply(resolved)
     }