Permalink
Browse files

Unbreak the IDE build following [21086]. No review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21094 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
  • Loading branch information...
1 parent 5201299 commit 01727305f4fe614a46e9918983046ea9326f9ca8 milessabin committed Mar 8, 2010
View
1 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,
View
3 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
View
2 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

0 comments on commit 0172730

Please sign in to comment.