diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala index a963582f4..968ffe6c7 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala @@ -221,8 +221,7 @@ private[sbt] object JLine { "Don't use jline.Terminal directly. Use Terminal.get.withCanonicalIn instead.", "1.4.0" ) - def usingTerminal[T](f: jline.Terminal => T): T = - Terminal.get.withCanonicalIn(f(Terminal.get.toJLine)) + def usingTerminal[T](f: jline.Terminal => T): T = f(Terminal.get.toJLine) @deprecated("unused", "1.4.0") def createReader(): ConsoleReader = createReader(None, Terminal.wrappedSystemIn) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala index d8ca471a3..1e30a4c6d 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala @@ -135,7 +135,6 @@ trait Terminal extends AutoCloseable { private[sbt] def name: String private[sbt] def withRawInput[T](f: => T): T = f - private[sbt] def withCanonicalIn[T](f: => T): T = f private[sbt] def write(bytes: Int*): Unit private[sbt] def printStream: PrintStream private[sbt] def withPrintStream[T](f: PrintStream => T): T @@ -381,7 +380,6 @@ object Terminal { t.setAttributes(attributes) override private[sbt] def setSize(width: Int, height: Int): Unit = t.setSize(width, height) override def withRawInput[T](f: => T): T = t.withRawInput(f) - override def withCanonicalIn[T](f: => T): T = t.withCanonicalIn(f) override def printStream: PrintStream = t.printStream override def withPrintStream[T](f: PrintStream => T): T = t.withPrintStream(f) override private[sbt] def withRawOutput[R](f: => R): R = t.withRawOutput(f) diff --git a/main/src/main/scala/sbt/internal/ConsoleProject.scala b/main/src/main/scala/sbt/internal/ConsoleProject.scala index 52beebc9a..f62f0d5a6 100644 --- a/main/src/main/scala/sbt/internal/ConsoleProject.scala +++ b/main/src/main/scala/sbt/internal/ConsoleProject.scala @@ -62,16 +62,14 @@ object ConsoleProject { val initCommands = importString + extra val terminal = Terminal.get - terminal.withCanonicalIn { - // TODO - Hook up dsl classpath correctly... - (new Console(compiler))( - unit.classpath, - options, - initCommands, - cleanupCommands, - terminal - )(Some(unit.loader), bindings).get - } + // TODO - Hook up dsl classpath correctly... + (new Console(compiler))( + unit.classpath, + options, + initCommands, + cleanupCommands, + terminal + )(Some(unit.loader), bindings).get () }