diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-02-21 11:29:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 11:29:25 -0800 |
| commit | a8c4a54d18c5560417d8c41db8b23a10fe8d616d (patch) | |
| tree | 68ec42406079cd83b71ff076adbc3a13db7e3eda /src/library/scala/util/Properties.scala | |
| parent | c96a9779891729981bb7644132d131de8e57c492 (diff) | |
| parent | 6411170ede09ace8e5f1f018dcf5661846ed7d27 (diff) | |
| download | scala-a8c4a54d18c5560417d8c41db8b23a10fe8d616d.tar.gz scala-a8c4a54d18c5560417d8c41db8b23a10fe8d616d.tar.bz2 scala-a8c4a54d18c5560417d8c41db8b23a10fe8d616d.zip | |
Merge pull request #5663 from gourlaysama/ticket/sd-256-enable-repl-colors-unix-2
Enable colored output by default on unix
Fix scala/scala-dev#256
Diffstat (limited to 'src/library/scala/util/Properties.scala')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 7b21351cf6..29a635fcbe 100644 --- 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. |