summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/jline.jar.desired.sha12
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/Completion.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/jline.jar.desired.sha1 b/lib/jline.jar.desired.sha1
index 4d3bff1e56..09d41ec4f2 100644
--- a/lib/jline.jar.desired.sha1
+++ b/lib/jline.jar.desired.sha1
@@ -1 +1 @@
-22f7477ecc5788bce62698f0a1219d486f7c0e0b ?jline.jar
+fe97bfa0e93eb94fd10204a3f996ddee23b9f305 ?jline.jar
diff --git a/src/compiler/scala/tools/nsc/interpreter/Completion.scala b/src/compiler/scala/tools/nsc/interpreter/Completion.scala
index 599ad8fa18..4b03299de1 100644
--- a/src/compiler/scala/tools/nsc/interpreter/Completion.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/Completion.scala
@@ -130,8 +130,8 @@ class Completion(val interpreter: Interpreter) extends Completor {
}
// jline's completion comes through here - we ask a Buffer for the candidates.
- override def complete(_buffer: String, cursor: Int, candidates: JList[_]): Int =
- new Buffer(_buffer).complete(candidates.asInstanceOf[JList[String]])
+ override def complete(_buffer: String, cursor: Int, candidates: JList[String]): Int =
+ new Buffer(_buffer).complete(candidates)
def completeStaticMembers(path: String): List[String] = {
import java.lang.reflect.Modifier.{ isPrivate, isProtected, isStatic }