From 635316902d3d46da31fb4afa607a683877b16e92 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 2 Sep 2019 11:07:48 -0700 Subject: [PATCH] Allow supershell to work in no color mode Supershell actually works quite well in no color mode. On the sbt side, we still want to disable supershell automatically if the output is not a terminal or no color is set, but this commit allows the user to force supershell through -Dsbt.supershell or the useSuperShell setting even when no color is set. --- .../main/scala/sbt/internal/util/ConsoleAppender.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 8a46acc35..4be18ffb3 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 @@ -523,12 +523,12 @@ class ConsoleAppender private[ConsoleAppender] ( } private def write(msg: String): Unit = { - if (!useFormat || !ansiCodesSupported) { - out.println(EscHelpers.removeEscapeSequences(msg)) - } else if (ConsoleAppender.showProgress) { - SuperShellLogger.writeMsg(out, msg) + val toWrite = + if (!useFormat || !ansiCodesSupported) EscHelpers.removeEscapeSequences(msg) else msg + if (ConsoleAppender.showProgress) { + SuperShellLogger.writeMsg(out, toWrite) } else { - out.println(msg) + out.println(toWrite) } }