summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAnton Sviridov <keynmol@gmail.com>2018-07-14 02:21:27 +0100
committerLi Haoyi <haoyi.sg@gmail.com>2018-07-14 09:21:27 +0800
commit2d779b8ccd0a2f29a7d14dc193b4ad093142b521 (patch)
tree5752f56c69bf8a873671830afab47349c55b6119 /core
parent5616dc9b46e033b39d0df12e42173ee1c875cee4 (diff)
downloadmill-2d779b8ccd0a2f29a7d14dc193b4ad093142b521.tar.gz
mill-2d779b8ccd0a2f29a7d14dc193b4ad093142b521.tar.bz2
mill-2d779b8ccd0a2f29a7d14dc193b4ad093142b521.zip
add --disable-ticker, handle --color correctly (#379)
Diffstat (limited to 'core')
-rw-r--r--core/src/mill/util/Logger.scala37
1 files changed, 20 insertions, 17 deletions
diff --git a/core/src/mill/util/Logger.scala b/core/src/mill/util/Logger.scala
index ec8de132..37ae8577 100644
--- a/core/src/mill/util/Logger.scala
+++ b/core/src/mill/util/Logger.scala
@@ -79,6 +79,7 @@ object PrintState{
case object Middle extends PrintState
}
case class PrintLogger(colored: Boolean,
+ disableTicker: Boolean,
colors: ammonite.util.Colors,
outStream: PrintStream,
infoStream: PrintStream,
@@ -100,23 +101,25 @@ case class PrintLogger(colored: Boolean,
errStream.println(colors.error()(s))
}
def ticker(s: String) = {
- printState match{
- case PrintState.Newline =>
- infoStream.println(colors.info()(s))
- case PrintState.Middle =>
- infoStream.println()
- infoStream.println(colors.info()(s))
- case PrintState.Ticker =>
- val p = new PrintWriter(infoStream)
- val nav = new ammonite.terminal.AnsiNav(p)
- nav.up(1)
- nav.clearLine(2)
- nav.left(9999)
- p.flush()
-
- infoStream.println(colors.info()(s))
+ if(!disableTicker) {
+ printState match{
+ case PrintState.Newline =>
+ infoStream.println(colors.info()(s))
+ case PrintState.Middle =>
+ infoStream.println()
+ infoStream.println(colors.info()(s))
+ case PrintState.Ticker =>
+ val p = new PrintWriter(infoStream)
+ val nav = new ammonite.terminal.AnsiNav(p)
+ nav.up(1)
+ nav.clearLine(2)
+ nav.left(9999)
+ p.flush()
+
+ infoStream.println(colors.info()(s))
+ }
+ printState = PrintState.Ticker
}
- printState = PrintState.Ticker
}
}
@@ -199,4 +202,4 @@ case class MultiLogger(colored: Boolean, logger1: Logger, logger2: Logger) exten
logger1.close()
logger2.close()
}
-} \ No newline at end of file
+}