luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Terminal.withCanonicalIn 

This was implemented as a no-op so we may as well get rid of it.
This commit is contained in:
Ethan Atkins 2020-09-17 09:37:29 -07:00
parent c291348d6a
commit 52743051eb
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
View File

@ -221,8 +221,7 @@ private[sbt] object JLine {
"Don't use jline.Terminal directly. Use Terminal.get.withCanonicalIn instead.", "Don't use jline.Terminal directly. Use Terminal.get.withCanonicalIn instead.",
"1.4.0" "1.4.0"
) )
def usingTerminal[T](f: jline.Terminal => T): T = def usingTerminal[T](f: jline.Terminal => T): T = f(Terminal.get.toJLine)
Terminal.get.withCanonicalIn(f(Terminal.get.toJLine))
@deprecated("unused", "1.4.0") @deprecated("unused", "1.4.0")
def createReader(): ConsoleReader = createReader(None, Terminal.wrappedSystemIn) def createReader(): ConsoleReader = createReader(None, Terminal.wrappedSystemIn)

2
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -135,7 +135,6 @@ trait Terminal extends AutoCloseable {
private[sbt] def name: String private[sbt] def name: String
private[sbt] def withRawInput[T](f: => T): T = f 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 write(bytes: Int*): Unit
private[sbt] def printStream: PrintStream private[sbt] def printStream: PrintStream
private[sbt] def withPrintStream[T](f: PrintStream => T): T private[sbt] def withPrintStream[T](f: PrintStream => T): T
@ -381,7 +380,6 @@ object Terminal {
t.setAttributes(attributes) t.setAttributes(attributes)
override private[sbt] def setSize(width: Int, height: Int): Unit = t.setSize(width, height) 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 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 printStream: PrintStream = t.printStream
override def withPrintStream[T](f: PrintStream => T): T = t.withPrintStream(f) override def withPrintStream[T](f: PrintStream => T): T = t.withPrintStream(f)
override private[sbt] def withRawOutput[R](f: => R): R = t.withRawOutput(f) override private[sbt] def withRawOutput[R](f: => R): R = t.withRawOutput(f)

18
main/src/main/scala/sbt/internal/ConsoleProject.scala
View File

@ -62,16 +62,14 @@ object ConsoleProject {
val initCommands = importString + extra val initCommands = importString + extra
val terminal = Terminal.get val terminal = Terminal.get
terminal.withCanonicalIn { // TODO - Hook up dsl classpath correctly...
// TODO - Hook up dsl classpath correctly... (new Console(compiler))(
(new Console(compiler))( unit.classpath,
unit.classpath, options,
options, initCommands,
initCommands, cleanupCommands,
cleanupCommands, terminal
terminal )(Some(unit.loader), bindings).get
)(Some(unit.loader), bindings).get
}
() ()
} }