diff options
| author | Miles Sabin <miles@milessabin.com> | 2010-03-08 10:20:05 +0000 |
|---|---|---|
| committer | Miles Sabin <miles@milessabin.com> | 2010-03-08 10:20:05 +0000 |
| commit | b13d8fe24e5e44d83676d9d10006d2014f2af039 (patch) | |
| tree | c3424e1db5166c9f0eea9cb4ee3798efe205cca9 /src | |
| parent | 2f5e86706602cdb7b9d27ccae7edc4cf9448b054 (diff) | |
| download | scala-b13d8fe24e5e44d83676d9d10006d2014f2af039.tar.gz scala-b13d8fe24e5e44d83676d9d10006d2014f2af039.tar.bz2 scala-b13d8fe24e5e44d83676d9d10006d2014f2af039.zip | |
Unbreak the IDE build following [21086].
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/AbsSettings.scala | 3 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/MutableSettings.scala | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/AbsSettings.scala b/src/compiler/scala/tools/nsc/settings/AbsSettings.scala index 91b26d083a..5750224e3d 100644 --- a/src/compiler/scala/tools/nsc/settings/AbsSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/AbsSettings.scala @@ -59,6 +59,9 @@ trait AbsSettings { def helpDescription: String def unparse: List[String] // A list of Strings which can recreate this setting. + /* For tools which need to populate lists of available choices */ + def choices : List[String] = Nil + /** In mutable Settings, these return the same object with a var set. * In immutable, of course they will return a new object, which means * we can't use "this.type", at least not in a non-casty manner, which diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index 9bcf48e1b7..9ba90f603f 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -480,7 +480,7 @@ class MutableSettings(val errorFn: String => Unit) extends AbsSettings with Scal class ChoiceSetting private[nsc]( name: String, descr: String, - val choices: List[String], + override val choices: List[String], val default: String) extends Setting(name, descr + choices.mkString(" (", ",", ")")) { type T = String |