summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-04-27 10:45:49 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-04-27 15:02:31 +1000
commit6871bccae321a04bea28144945c6afa4b6276905 (patch)
tree72748dbe1bc2ca60256bf00aa2f60bdcb2fce167
parent365ac035a863a666f86151371db77c6d401e88a2 (diff)
downloadscala-6871bccae321a04bea28144945c6afa4b6276905.tar.gz
scala-6871bccae321a04bea28144945c6afa4b6276905.tar.bz2
scala-6871bccae321a04bea28144945c6afa4b6276905.zip
SI-9762 Remove workaround after upstream fix in jline
Now that we use a release of JLine that includes the fix for: https://github.com/jline/jline2/issues/208 We no longer need to the workaround introduced in 7719a3c. Screencast of the still-fixed behaviour: http://recordit.co/5pzh9OhlQv.gif
-rw-r--r--src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala20
1 files changed, 0 insertions, 20 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 85287b83f0..95964e18d9 100644
--- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
+++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
@@ -141,26 +141,6 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter
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
}
}