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 caadc57b6a..dc04230d0b 100644
--- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
+++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
@@ -11,11 +11,11 @@ import java.util.{Collection => JCollection, List => JList}
 
 import _root_.jline.{console => jconsole}
 import jline.console.ConsoleReader
-import jline.console.completer.{CandidateListCompletionHandler, CompletionHandler, Completer, ArgumentCompleter}
+import jline.console.completer.{CandidateListCompletionHandler, Completer, CompletionHandler}
 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
 
@@ -127,10 +127,10 @@ 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
         }
@@ -139,12 +139,7 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter
       case clch: CandidateListCompletionHandler => clch.setPrintSpaceAfterFullCompletion(false)
     }
 
-    // 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
     }