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

Use util 0.1.0-M9 that implements thread-friendly readLine

This commit is contained in:
Eugene Yokota 2016-03-18 23:29:36 -04:00
parent 3381f59ae8
commit 1b1f2abfbe
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/command/src/main/scala/sbt/ConsoleListener.scala
View File

@ -12,15 +12,7 @@ private[sbt] final class ConsoleListener(queue: ConcurrentLinkedQueue[(String, O
val s = status.state
val history = (s get historyPath) getOrElse Some(new File(s.baseDir, ".history"))
val prompt = (s get shellPrompt) match { case Some(pf) => pf(s); case None => "> " }
// val reader = new FullReader(history, s.combinedParser)
// val line = reader.readLine(prompt)
// line match {
// case Some(line) =>
// val newState = s.copy(onFailure = Some(Shell), remainingCommands = line +: Shell +: s.remainingCommands).setInteractive(true)
// if (line.trim.isEmpty) newState else newState.clearGlobalLog
// case None => s.setInteractive(false)
// }
val reader = JLine.simple(None, false)
val reader = new FullReader(history, s.combinedParser)
override def run(): Unit = {
try {
val line = reader.readLine(prompt)
@ -45,7 +37,6 @@ private[sbt] final class ConsoleListener(queue: ConcurrentLinkedQueue[(String, O
case Some(x) if x.isAlive =>
x.interrupt
askUserThread = None
println("shutdown ask user thread")
case _ => ()
}
@ -54,10 +45,8 @@ private[sbt] final class ConsoleListener(queue: ConcurrentLinkedQueue[(String, O
def resume(status: CommandStatus): Unit =
askUserThread match {
case Some(x) if x.isAlive => //
println("resume??")
case _ =>
val x = makeAskUserThread(status)
println("resume")
x.start
askUserThread = Some(x)
}