diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2017-01-09 16:48:54 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan@lightbend.com> | 2017-01-09 16:59:54 -0800 |
commit | cd1006c75e5cf778813dc2c15fa5924a164a2f83 (patch) | |
tree | ffc832598ae8303a8ab8b6c7476902747832fbd5 /src/repl-jline | |
parent | 55f596b142cf31e893792201ba90f7720b963e5b (diff) | |
download | scala-cd1006c75e5cf778813dc2c15fa5924a164a2f83.tar.gz scala-cd1006c75e5cf778813dc2c15fa5924a164a2f83.tar.bz2 scala-cd1006c75e5cf778813dc2c15fa5924a164a2f83.zip |
Revert "Repl prints '\n' as newline, not "^J""
This reverts commit d571fa07 (#5450).
Superseded by upgrade to jline2 2.14.3 (jline/jline2@01969b5)
Diffstat (limited to 'src/repl-jline')
-rw-r--r-- | src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala | 12 |
1 files changed, 2 insertions, 10 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 912ac26329..dc04230d0b 100644 --- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala +++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala @@ -94,19 +94,11 @@ 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 => - rawPrintln(xs.mkString) + println(xs.mkString) linesLeft -= 1 if (linesLeft <= 0) { linesLeft = emulateMore() @@ -117,7 +109,7 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter } def readOneKey(prompt: String) = { - _rawPrint(prompt) + this.print(prompt) this.flush() this.readCharacter() } |