1 files changed, 4 insertions, 22 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 1f2b0952e7..95964e18d9 100644
--- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
+++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
@@ -11,10 +11,9 @@ import java.util.{Collection => JCollection, List => JList}
 
 import _root_.jline.{console => jconsole}
 import jline.console.ConsoleReader
-import jline.console.completer.{CompletionHandler, Completer}
+import jline.console.completer.{CandidateListCompletionHandler, Completer, CompletionHandler}
 import jconsole.history.{History => JHistory}
 
-
 import scala.tools.nsc.interpreter
 import scala.tools.nsc.interpreter.{Completion, NoCompletion}
 import scala.tools.nsc.interpreter.Completion.Candidates
@@ -133,32 +132,15 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter
           newCursor
         }
       }
+    getCompletionHandler match {
+      case clch: CandidateListCompletionHandler => clch.setPrintSpaceAfterFullCompletion(false)
+    }
 
     completion match {
       case NoCompletion       => ()
       case _                  => this addCompleter completer
     }
 
-    // This is a workaround for https://github.com/jline/jline2/issues/208
-    // and should not be necessary once we upgrade to JLine 2.13.1
-    ///
-    // Test by:
-    // scala> {" ".char}<LEFT><TAB>
-    //
-    // And checking we don't get an extra } on the line.
-    ///
-    val handler = getCompletionHandler
-    setCompletionHandler(new CompletionHandler {
-      override def complete(consoleReader: ConsoleReader, list: JList[CharSequence], i: Int): Boolean = {
-        try {
-          handler.complete(consoleReader, list, i)
-        } finally if (getCursorBuffer.cursor != getCursorBuffer.length()) {
-          print(" ")
-          getCursorBuffer.write(' ')
-          backspace()
-        }
-      }
-    })
     setAutoprintThreshold(400) // max completion candidates without warning
   }
 }