diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-06-01 18:24:00 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-06-01 18:24:00 +0200 |
| commit | f594b17ac5b7a05cfca3f7b4b1113c063b974327 (patch) | |
| tree | 41c9af31cf17acdd12e9584dc1f23b5e1a598f5a /src/dotty | |
| parent | a5db35def41d10e4e84dc294e55fbfd79ebc8cab (diff) | |
| download | dotty-f594b17ac5b7a05cfca3f7b4b1113c063b974327.tar.gz dotty-f594b17ac5b7a05cfca3f7b4b1113c063b974327.tar.bz2 dotty-f594b17ac5b7a05cfca3f7b4b1113c063b974327.zip | |
Disable "auto" alternative in `-color` flag
Diffstat (limited to 'src/dotty')
| -rw-r--r-- | src/dotty/tools/dotc/config/ScalaSettings.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/Contexts.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/config/ScalaSettings.scala b/src/dotty/tools/dotc/config/ScalaSettings.scala index 54a77eee8..2192e510f 100644 --- a/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -28,7 +28,7 @@ class ScalaSettings extends Settings.SettingGroup { val help = BooleanSetting("-help", "Print a synopsis of standard options") val nowarn = BooleanSetting("-nowarn", "Generate no warnings.") val print = BooleanSetting("-print", "Print program with Scala-specific features removed.") - val color = ChoiceSetting("-color", "mode", "Colored output", List("always", "never", "auto"), "auto") + val color = ChoiceSetting("-color", "mode", "Colored output", List("always", "never"/*, "auto"*/), "always"/* "auto"*/) val target = ChoiceSetting("-target", "target", "Target platform for object files. All JVM 1.5 targets are deprecated.", List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "jvm-1.8", "msil"), "jvm-1.8") diff --git a/src/dotty/tools/dotc/core/Contexts.scala b/src/dotty/tools/dotc/core/Contexts.scala index 68ae0e752..635f79f59 100644 --- a/src/dotty/tools/dotc/core/Contexts.scala +++ b/src/dotty/tools/dotc/core/Contexts.scala @@ -372,7 +372,7 @@ object Contexts { /** Should use colors when printing? */ def useColors: Boolean = - List("auto", "always") contains base.settings.color.value + base.settings.color.value == "always" /** A condensed context containing essential information of this but * no outer contexts except the initial context. |