From efe04c1cdecc5e43521c9b12565426d52f518b3d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 2 Oct 2018 08:51:17 -0400 Subject: [PATCH] Cleaning up code --- .../sbt/internal/util/ConsoleAppender.scala | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala index 79e210b62..fedb80f9f 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala @@ -150,13 +150,12 @@ object ConsoleAppender { private[sbt] def parseLogOption(s: String): LogOption = s.toLowerCase match { - case "always" => LogOption.Always - case "auto" => LogOption.Auto - case "never" => LogOption.Never - case "true" => LogOption.Always - case "false" => LogOption.Never - case "default" => LogOption.Auto - case _ => LogOption.Auto + case "always" => LogOption.Always + case "auto" => LogOption.Auto + case "never" => LogOption.Never + case "true" => LogOption.Always + case "false" => LogOption.Never + case _ => LogOption.Auto } private[this] val generateId: AtomicInteger = new AtomicInteger @@ -462,12 +461,13 @@ class ConsoleAppender private[ConsoleAppender] ( private final val DeleteLine = "\u001B[2K" private final val CursorLeft1000 = "\u001B[1000D" private def write(msg: String): Unit = { - if (!useFormat || !ansiCodesSupported) out.println(EscHelpers.removeEscapeSequences(msg)) - else { - if (ConsoleAppender.showProgress) { - out.print(s"$ScrollUp$DeleteLine$msg${CursorLeft1000}") - out.flush() - } else out.println(msg) + if (!useFormat || !ansiCodesSupported) { + out.println(EscHelpers.removeEscapeSequences(msg)) + } else if (ConsoleAppender.showProgress) { + out.print(s"$ScrollUp$DeleteLine$msg${CursorLeft1000}") + out.flush() + } else { + out.println(msg) } }