summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-03-19 15:27:01 +0000
committerPaul Phillips <paulp@improving.org>2011-03-19 15:27:01 +0000
commit8f0ff8bc2aaaa5299ebe4f617ab9e28443f994bd (patch)
tree52ec2ea9bd731813332a6c47aafb251ac8ad1b50 /src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
parentffa29b1f312dfe12186fbe47ac8273ee9599eaf6 (diff)
downloadscala-8f0ff8bc2aaaa5299ebe4f617ab9e28443f994bd.tar.gz
scala-8f0ff8bc2aaaa5299ebe4f617ab9e28443f994bd.tar.bz2
scala-8f0ff8bc2aaaa5299ebe4f617ab9e28443f994bd.zip
A couple more minor tweaks to power mode, and m...
A couple more minor tweaks to power mode, and more importantly, fix for a jline NPE provoked if your classloaders loaded classes in a way other than it expected. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala')
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala b/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
index 796934cd35..7430406306 100644
--- a/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/JLineCompletion.scala
@@ -201,7 +201,13 @@ class JLineCompletion(val intp: IMain) extends Completion with CompletionOutput
}
// top level packages
- object rootClass extends TypeMemberCompletion(RootClass.tpe) { }
+ object rootClass extends TypeMemberCompletion(RootClass.tpe) {
+ override def completions(verbosity: Int) = super.completions(verbosity) :+ "_root_"
+ override def follow(id: String) = id match {
+ case "_root_" => Some(this)
+ case _ => super.follow(id)
+ }
+ }
// members of Predef
object predef extends TypeMemberCompletion(PredefModule.tpe) {
override def excludeEndsWith = super.excludeEndsWith ++ List("Wrapper", "ArrayOps")