1 files changed, 15 insertions, 4 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 95964e18d9..912ac26329 100644
--- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
+++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
@@ -32,11 +32,14 @@ class InteractiveReader(completer: () => Completion) extends interpreter.Interac
   private val consoleReader = {
     val reader = new JLineConsoleReader()
 
-    reader setPaginationEnabled interpreter.`package`.isPaged
+    reader setPaginationEnabled interpreter.isPaged
 
-    // ASAP
+    // turn off magic !
     reader setExpandEvents false
 
+    // enable detecting pasted tab char (when next char is immediately available) which is taken raw, not completion
+    reader setCopyPasteDetection true
+
     reader setHistory history.asInstanceOf[JHistory]
 
     reader
@@ -91,11 +94,19 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter
     printColumns_(items: List[String])
   }
 
+  // Workaround for JLine weirdness. (See https://github.com/scala/scala-dev/issues/240)
+  // Emit control characters as-is, instead of representing them as e.g. "^J" (for '\n').
+  // `rawPrint` is package protected in jline.console.ConsoleReader, while `rawPrintln` is private
+  // Copy/paste part of it as `_rawPrint` (to avoid name clash);
+  // the super class impl also sets `cursorOk`, but that's out of reach for us.
+  private def _rawPrint(str: String) = getOutput.write(str)
+  private def rawPrintln(str: String) = { _rawPrint(str); println() }
+
   private def printColumns_(items: List[String]): Unit = if (items exists (_ != "")) {
     val grouped = tabulate(items)
     var linesLeft = if (isPaginationEnabled()) height - 1 else Int.MaxValue
     grouped foreach { xs =>
-      println(xs.mkString)
+      rawPrintln(xs.mkString)
       linesLeft -= 1
       if (linesLeft <= 0) {
         linesLeft = emulateMore()
@@ -106,7 +117,7 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter
   }
 
   def readOneKey(prompt: String) = {
-    this.print(prompt)
+    _rawPrint(prompt)
     this.flush()
     this.readCharacter()
   }