diff options
Diffstat (limited to 'src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala')
-rw-r--r-- | src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala index b5db4c2098..1f2b0952e7 100644 --- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala +++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala @@ -11,12 +11,12 @@ import java.util.{Collection => JCollection, List => JList} import _root_.jline.{console => jconsole} import jline.console.ConsoleReader -import jline.console.completer.{CompletionHandler, Completer, ArgumentCompleter} +import jline.console.completer.{CompletionHandler, Completer} import jconsole.history.{History => JHistory} import scala.tools.nsc.interpreter -import scala.tools.nsc.interpreter.{Completion, JLineCompletion, NoCompletion} +import scala.tools.nsc.interpreter.{Completion, NoCompletion} import scala.tools.nsc.interpreter.Completion.Candidates import scala.tools.nsc.interpreter.session.History @@ -125,21 +125,16 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter // adapt the JLine completion interface def completer = new Completer { - val tc = completion.completer() + val tc = completion def complete(_buf: String, cursor: Int, candidates: JList[CharSequence]): Int = { val buf = if (_buf == null) "" else _buf - val Candidates(newCursor, newCandidates) = tc.complete(buf, cursor) + val Candidates(newCursor, newCandidates) = completion.complete(buf, cursor) newCandidates foreach (candidates add _) newCursor } } - // a last bit of nastiness: parsing help depending on the flavor of completer (fixme) completion match { - case _: JLineCompletion => - val jlineCompleter = new ArgumentCompleter(new JLineDelimiter, completer) - jlineCompleter setStrict false - this addCompleter jlineCompleter case NoCompletion => () case _ => this addCompleter completer } |