From 1d3af543f706de71d513765d43607b2f798f610d Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 2 Nov 2020 11:04:35 -0800 Subject: [PATCH] Disable color by default if formatting is disabled If a user runs with -Dsbt.log.format=false or -Dsbt.log.noformat=true, we should disable color by default. Running with -Dsbt.color=true should make this possible. --- .../src/main/scala/sbt/internal/util/Terminal.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala index 7ff0c228a..e037be9f1 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala @@ -317,7 +317,7 @@ object Terminal { props .map(_.color) .orElse(isColorEnabledProp) - .getOrElse((hasConsole && !isDumbTerminal && logFormatEnabled.getOrElse(true)) || isCI) + .getOrElse(logFormatEnabled.getOrElse(true) && ((hasConsole && !isDumbTerminal) || isCI)) } private[this] lazy val isColorEnabledProp: Option[Boolean] = sys.props.get("sbt.color").orElse(sys.props.get("sbt.colour")).flatMap(parseLogOption)