SD-256 enable colored output by default on unix

gourlaysama · gourlaysama · commit 6411170ede09 · 2017-02-21T15:39:26.000+01:00
`scala.color` now has 3 states: `true`, `false` and `auto`
(the default). `auto` allows colors if not on windows and if the shell
is interactive (as in, both stdin and stdout are a tty).

The autodetect works as expected when run via SBT too, and it can always
be overriden on the CLI or via JAVA_OPTS.
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
@@ -423,6 +423,14 @@ filter {
     {
       matchName="scala.annotation.showAsInfix"
       problemName=MissingClassProblem
+    },
+    {
+      matchName="scala.util.PropertiesTrait.coloredOutputEnabled"
+      problemName=DirectMissingMethodProblem
+    },
+    {
+      matchName="scala.util.Properties.coloredOutputEnabled"
+      problemName=DirectMissingMethodProblem
     }
   ]
 }
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala
@@ -154,6 +154,12 @@ private[scala] trait PropertiesTrait {
   /* Some runtime values. */
   private[scala] def isAvian = javaVmName contains "Avian"
 
+  private[scala] def coloredOutputEnabled: Boolean = propOrElse("scala.color", "auto") match {
+    case "auto" => System.console() != null && !isWin
+    case a if a.toLowerCase() == "true" => true
+    case _ => false
+  }
+
   // This is looking for javac, tools.jar, etc.
   // Tries JDK_HOME first, then the more common but likely jre JAVA_HOME,
   // and finally the system property based javaHome.
diff --git a/src/reflect/scala/reflect/internal/TypeDebugging.scala b/src/reflect/scala/reflect/internal/TypeDebugging.scala
@@ -59,7 +59,7 @@ trait TypeDebugging {
   object typeDebug {
     import scala.Console._
 
-    private val colorsOk = sys.props contains "scala.color"
+    private val colorsOk = scala.util.Properties.coloredOutputEnabled
     private def inColor(s: String, color: String) = if (colorsOk && s != "") color +        s + RESET else s
     private def inBold(s: String, color: String)  = if (colorsOk && s != "") color + BOLD + s + RESET else s
 
diff --git a/src/repl/scala/tools/nsc/interpreter/ReplProps.scala b/src/repl/scala/tools/nsc/interpreter/ReplProps.scala
@@ -17,7 +17,7 @@ class ReplProps {
   private def int(name: String)  = Prop[Int](name)
 
   // This property is used in TypeDebugging. Let's recycle it.
-  val colorOk = bool("scala.color")
+  val colorOk = Properties.coloredOutputEnabled
 
   val info  = bool("scala.repl.info")
   val debug = bool("scala.repl.debug")

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,14 @@ filter {`
`423`	`423`	`{`
`424`	`424`	`matchName="scala.annotation.showAsInfix"`
`425`	`425`	`problemName=MissingClassProblem`
	`426`	`+ },`
	`427`	`+ {`
	`428`	`+ matchName="scala.util.PropertiesTrait.coloredOutputEnabled"`
	`429`	`+ problemName=DirectMissingMethodProblem`
	`430`	`+ },`
	`431`	`+ {`
	`432`	`+ matchName="scala.util.Properties.coloredOutputEnabled"`
	`433`	`+ problemName=DirectMissingMethodProblem`
`426`	`434`	`}`
`427`	`435`	`]`
`428`	`436`	`}`