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

ensure enableEcho called after jline.Terminal.getTerminal. fixes #460

This commit is contained in:
Mark Harrah 2012-05-19 18:20:19 -04:00
parent dabb0fd377
commit 1f612aaecb
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/complete/LineReader.scala
View File

@ -53,8 +53,9 @@ abstract class JLine extends LineReader
} }
private object JLine private object JLine
{ {
def terminal = jline.Terminal.getTerminal // When calling this, ensure that enableEcho has been or will be called.
def resetTerminal() = withTerminal { _ => jline.Terminal.resetTerminal } // getTerminal will initialize the terminal to disable echo.
private def terminal = jline.Terminal.getTerminal
private def withTerminal[T](f: jline.Terminal => T): T = private def withTerminal[T](f: jline.Terminal => T): T =
synchronized synchronized
{ {

9
util/log/ConsoleLogger.scala
View File

@ -35,8 +35,13 @@ object ConsoleLogger
} }
private[this] def ansiSupported = private[this] def ansiSupported =
try { jline.Terminal.getTerminal.isANSISupported } try {
catch { case e: Exception => !isWindows } val terminal = jline.Terminal.getTerminal
terminal.enableEcho() // #460
terminal.isANSISupported
} catch {
case e: Exception => !isWindows
}
private[this] def os = System.getProperty("os.name") private[this] def os = System.getProperty("os.name")
private[this] def isWindows = os.toLowerCase.indexOf("windows") >= 0 private[this] def isWindows = os.toLowerCase.indexOf("windows") >= 0