From 2d779b8ccd0a2f29a7d14dc193b4ad093142b521 Mon Sep 17 00:00:00 2001 From: Anton Sviridov Date: Sat, 14 Jul 2018 02:21:27 +0100 Subject: add --disable-ticker, handle --color correctly (#379) --- core/src/mill/util/Logger.scala | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'core') 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 +} -- cgit v1.2.3