summaryrefslogtreecommitdiff
path: root/src/repl-jline/scala/tools/nsc/interpreter
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-04-27 10:40:02 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-04-27 15:01:31 +1000
commit365ac035a863a666f86151371db77c6d401e88a2 (patch)
tree8ba6f013df87da23c9742b2b4ab74994918822b2 /src/repl-jline/scala/tools/nsc/interpreter
parent93f209dd65d5c05fc2cb61916a850940499c9261 (diff)
downloadscala-365ac035a863a666f86151371db77c6d401e88a2.tar.gz
scala-365ac035a863a666f86151371db77c6d401e88a2.tar.bz2
scala-365ac035a863a666f86151371db77c6d401e88a2.zip
SI-9762 Update to JLine 2.14.1
Motivated by the improvements to multi-byte character handling. Screencast showing the reported bug is fixed: http://g.recordit.co/ie1Z367NUl.gif Here's the changelog since JLine 2.12.1: https://github.com/jline/jline2/compare/jline-2.12.1...jline-2.14.1 I needed to disable a new, on-by-default feature in JLine so that it didn't add a " " after completing the token `equals` in `foo.equa<TAB>`.
Diffstat (limited to 'src/repl-jline/scala/tools/nsc/interpreter')
-rw-r--r--src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala6
1 files changed, 4 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 1f2b0952e7..85287b83f0 100644
--- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
+++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineReader.scala
@@ -11,10 +11,9 @@ import java.util.{Collection => JCollection, List => JList}
import _root_.jline.{console => jconsole}
import jline.console.ConsoleReader
-import jline.console.completer.{CompletionHandler, Completer}
+import jline.console.completer.{CandidateListCompletionHandler, Completer, CompletionHandler}
import jconsole.history.{History => JHistory}
-
import scala.tools.nsc.interpreter
import scala.tools.nsc.interpreter.{Completion, NoCompletion}
import scala.tools.nsc.interpreter.Completion.Candidates
@@ -133,6 +132,9 @@ private class JLineConsoleReader extends jconsole.ConsoleReader with interpreter
newCursor
}
}
+ getCompletionHandler match {
+ case clch: CandidateListCompletionHandler => clch.setPrintSpaceAfterFullCompletion(false)
+ }
completion match {
case NoCompletion => ()