diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-24 15:21:08 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-05 16:00:29 -0700 |
commit | 1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662 (patch) | |
tree | 14755f21d0b6eeac18c3fe3c29ef361a391204ab /src/repl | |
parent | 46a4635d3acc0a18869131879e6cde862d6b9776 (diff) | |
download | scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.tar.gz scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.tar.bz2 scala-1b0fa91aa3f4d469505e5a1ff5d9cb1db0bdf662.zip |
Unfork jline: use vanilla jline 2.11 as a dependency.
Notes:
- no longer specifying terminal by class name in scripts (using 'unix')
- jline doesn't need a separate jansi dependency;
it includes its own version according to:
http://mvnrepository.com/artifact/jline/jline/2.11
Diffstat (limited to 'src/repl')
5 files changed, 14 insertions, 9 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala b/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala index 48af261937..cf03ecb480 100644 --- a/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala +++ b/src/repl/scala/tools/nsc/interpreter/ConsoleReaderHelper.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interpreter -import scala.tools.jline.console.{ ConsoleReader, CursorBuffer } +import jline.console.{ ConsoleReader, CursorBuffer } trait ConsoleReaderHelper extends ConsoleReader { def terminal = getTerminal() diff --git a/src/repl/scala/tools/nsc/interpreter/Delimited.scala b/src/repl/scala/tools/nsc/interpreter/Delimited.scala index e88a044931..b7f06f1d0a 100644 --- a/src/repl/scala/tools/nsc/interpreter/Delimited.scala +++ b/src/repl/scala/tools/nsc/interpreter/Delimited.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interpreter -import scala.tools.jline.console.completer.ArgumentCompleter.{ ArgumentDelimiter, ArgumentList } +import jline.console.completer.ArgumentCompleter.{ ArgumentDelimiter, ArgumentList } class JLineDelimiter extends ArgumentDelimiter { def toJLine(args: List[String], cursor: Int) = args match { diff --git a/src/repl/scala/tools/nsc/interpreter/JLineReader.scala b/src/repl/scala/tools/nsc/interpreter/JLineReader.scala index 5d41f1bbb4..d8a876feb2 100644 --- a/src/repl/scala/tools/nsc/interpreter/JLineReader.scala +++ b/src/repl/scala/tools/nsc/interpreter/JLineReader.scala @@ -6,8 +6,8 @@ package scala.tools.nsc package interpreter -import scala.tools.jline.console.ConsoleReader -import scala.tools.jline.console.completer._ +import jline.console.ConsoleReader +import jline.console.completer._ import session._ import Completion._ @@ -42,7 +42,7 @@ class JLineReader(_completion: => Completion) extends InteractiveReader { def readOneKey(prompt: String) = { this.print(prompt) this.flush() - this.readVirtualKey() + this.readCharacter() } def eraseLine() = consoleReader.resetPromptLine("", "", 0) def redrawLineAndFlush(): Unit = { flush() ; drawLine() ; flush() } diff --git a/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala b/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala index 89998e438a..7c49b91296 100644 --- a/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala +++ b/src/repl/scala/tools/nsc/interpreter/session/SimpleHistory.scala @@ -46,6 +46,11 @@ class SimpleHistory extends JLineHistory { def entries(): JListIterator[JEntry] = toEntries().asJava.listIterator() def iterator: JIterator[JEntry] = toEntries().iterator.asJava + def remove(idx: Int): CharSequence = buf remove idx + def removeFirst(): CharSequence = buf remove 0 + def removeLast(): CharSequence = buf remove lastIndex + def set(idx: Int, to: CharSequence): Unit = buf(idx) = to + def current() = if (index >= 0 && index < buf.size) buf(index) else fail("current()") def previous() = (index > 0) && minusOne def next() = (index <= lastIndex) && plusOne diff --git a/src/repl/scala/tools/nsc/interpreter/session/package.scala b/src/repl/scala/tools/nsc/interpreter/session/package.scala index c62cf21151..a3d7312c98 100644 --- a/src/repl/scala/tools/nsc/interpreter/session/package.scala +++ b/src/repl/scala/tools/nsc/interpreter/session/package.scala @@ -14,10 +14,10 @@ package object session { type JIterator[T] = java.util.Iterator[T] type JListIterator[T] = java.util.ListIterator[T] - type JEntry = scala.tools.jline.console.history.History.Entry - type JHistory = scala.tools.jline.console.history.History - type JMemoryHistory = scala.tools.jline.console.history.MemoryHistory - type JPersistentHistory = scala.tools.jline.console.history.PersistentHistory + type JEntry = jline.console.history.History.Entry + type JHistory = jline.console.history.History + type JMemoryHistory = jline.console.history.MemoryHistory + type JPersistentHistory = jline.console.history.PersistentHistory private[interpreter] implicit def charSequenceFix(x: CharSequence): String = x.toString } |