diff options
author | Paul Phillips <paulp@improving.org> | 2013-02-01 17:39:44 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-02-01 17:39:44 -0800 |
commit | 0c93c71afa9407e57a978ceef3e0133b26c7f412 (patch) | |
tree | ed41b06e7a05dc893711ce133adac9b73ed60ce3 | |
parent | cf95fb81b906fed2bf7b38c4ff3cf8b9927d1e9d (diff) | |
parent | d1b6d8b20f55d0b11102ced679b54ec5ea208f8f (diff) | |
download | scala-0c93c71afa9407e57a978ceef3e0133b26c7f412.tar.gz scala-0c93c71afa9407e57a978ceef3e0133b26c7f412.tar.bz2 scala-0c93c71afa9407e57a978ceef3e0133b26c7f412.zip |
Merge commit 'd1b6d8b20f' into wip/fresh-merge2
Conflicts:
src/compiler/scala/tools/nsc/interpreter/JLineReader.scala
-rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/JLineReader.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala b/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala index a620c7c75a..5d41f1bbb4 100644 --- a/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala +++ b/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala @@ -34,6 +34,11 @@ class JLineReader(_completion: => Completion) extends InteractiveReader { } class JLineConsoleReader extends ConsoleReader with ConsoleReaderHelper { + // working around protected/trait/java insufficiencies. + def goBack(num: Int): Unit = back(num) + if ((history: History) ne NoHistory) + this setHistory history + def readOneKey(prompt: String) = { this.print(prompt) this.flush() @@ -45,8 +50,6 @@ class JLineReader(_completion: => Completion) extends InteractiveReader { // A hook for running code after the repl is done initializing. lazy val postInit: Unit = { this setBellEnabled false - if ((history: History) ne NoHistory) - this setHistory history if (completion ne NoCompletion) { val argCompletor: ArgumentCompleter = |