summaryrefslogtreecommitdiff
path: root/core/src/main/scala/mill/main/MainRunner.scala
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-04 21:00:00 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-04 21:00:00 -0800
commitfb68da0e6803f2f8eb948515672bd2297aaa1709 (patch)
tree0bb086b005fbe96f8e68e4c2f4baf20706d48d6e /core/src/main/scala/mill/main/MainRunner.scala
parent53f55cbba68617ff1a96c77ebb061276e4c8248d (diff)
downloadmill-fb68da0e6803f2f8eb948515672bd2297aaa1709.tar.gz
mill-fb68da0e6803f2f8eb948515672bd2297aaa1709.tar.bz2
mill-fb68da0e6803f2f8eb948515672bd2297aaa1709.zip
First pass at a ticker-based progress logger to reduce the spamminess of the console
Diffstat (limited to 'core/src/main/scala/mill/main/MainRunner.scala')
-rw-r--r--core/src/main/scala/mill/main/MainRunner.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/src/main/scala/mill/main/MainRunner.scala b/core/src/main/scala/mill/main/MainRunner.scala
index 1b2322b0..4a6be436 100644
--- a/core/src/main/scala/mill/main/MainRunner.scala
+++ b/core/src/main/scala/mill/main/MainRunner.scala
@@ -1,9 +1,10 @@
package mill.main
import java.io.{InputStream, OutputStream, PrintStream}
+import ammonite.Main
import ammonite.interp.{Interpreter, Preprocessor}
import ammonite.ops.Path
-import ammonite.util.{Imports, Name, Res, Util}
+import ammonite.util._
import mill.discover.Discovered
import mill.eval.{Evaluator, PathRef}
import upickle.Js
@@ -21,6 +22,7 @@ class MainRunner(config: ammonite.main.Cli.Config, show: Boolean,
stdErr: OutputStream)
extends ammonite.MainRunner(config, outprintStream, errPrintStream, stdIn, stdOut, stdErr){
var lastEvaluator: Option[(Seq[(Path, Long)], Evaluator[_])] = None
+
override def runScript(scriptPath: Path, scriptArgs: List[String]) =
watchLoop(
isRepl = false,
@@ -28,7 +30,7 @@ class MainRunner(config: ammonite.main.Cli.Config, show: Boolean,
mainCfg => {
val (result, interpWatched) = RunScript.runScript(
mainCfg.wd, scriptPath, mainCfg.instantiateInterpreter(), scriptArgs, lastEvaluator,
- errPrintStream, errPrintStream
+ errPrintStream, errPrintStream, colors
)
result match{