diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-04-27 10:45:49 +1000 |
---|---|---|
committer | Adriaan Moors <adriaan@lightbend.com> | 2017-01-09 16:33:32 -0800 |
commit | f070a767802721040af7f81985851a50d5e6d85a (patch) | |
tree | 47501b2e0bec2a08fc47f865c04f413fd49a806b /src | |
parent | 2113a7c88e2a167cf05ff199ee8dc76f12449fea (diff) | |
download | scala-f070a767802721040af7f81985851a50d5e6d85a.tar.gz scala-f070a767802721040af7f81985851a50d5e6d85a.tar.bz2 scala-f070a767802721040af7f81985851a50d5e6d85a.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
(cherry picked from commit 6871bccae321a04bea28144945c6afa4b6276905)
Diffstat (limited to 'src')
-rw-r--r-- | src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala | 20 |
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 7b4d9dc8c1..caadc57b6a 100644 --- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala +++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala @@ -149,26 +149,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 } } |