diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-10-18 10:59:51 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-10-18 10:59:51 -0700 |
| commit | 3d5e0697a04366c541440935b995c362c1968bb1 (patch) | |
| tree | 22517ef7ac9f15da426f21393317956349c09b8d /src/repl-jline/scala/tools/nsc | |
| parent | 9df0e123ac8cfc915f818bcd946889bde9a148f3 (diff) | |
| parent | 4f3f008c058f7a448bd05a0b5dfcb2a931481c8c (diff) | |
| download | scala-3d5e0697a04366c541440935b995c362c1968bb1.tar.gz scala-3d5e0697a04366c541440935b995c362c1968bb1.tar.bz2 scala-3d5e0697a04366c541440935b995c362c1968bb1.zip | |
Merge 2.11.x into 2.12.x, including #5239, #5240
Diffstat (limited to 'src/repl-jline/scala/tools/nsc')
| -rw-r--r-- | src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala | 7 |
1 files changed, 5 insertions, 2 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..dc04230d0b 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 |