diff options
| -rw-r--r-- | META-INF/MANIFEST.MF | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/AbsSettings.scala | 3 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/MutableSettings.scala | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index c32834a6e9..8f8b0bfd3d 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -28,6 +28,7 @@ Export-Package: scala.tools.nsc.matching, scala.tools.nsc.plugins, scala.tools.nsc.reporters, + scala.tools.nsc.settings, scala.tools.nsc.symtab, scala.tools.nsc.symtab.classfile, scala.tools.nsc.transform, 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 |