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

Merge pull request #5673 from eatkins/client-watch-fixes 

UI fixes for remote client in watch
This commit is contained in:
eugene yokota 2020-07-12 00:55:03 -04:00 committed by GitHub
parent ab5e57afb1 baa96be6dc
commit 6110734383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/internal/Continuous.scala
View File

@ -800,7 +800,6 @@ private[sbt] object Continuous extends DeprecatedContinuous {
.foreach(logger.debug(_))
min match {
case ShowOptions =>
ConsoleOut.systemOut.println("")
rawLogger.info(options)
Watch.Ignore
case m => m
@ -1259,7 +1258,7 @@ private[sbt] object ContinuousCommands {
watchState(channel).beforeCommand(state)
}
private[this] val postWatchCommand = watchCommand(postWatch) { (channel, state) =>
StandardMain.exchange.channelForName(channel).foreach(_.terminal.setPrompt(Prompt.Watch))
StandardMain.exchange.unprompt(ConsoleUnpromptEvent(Some(CommandSource(channel))), false)
val ws = watchState(channel)
watchStates.put(channel, ws.withPending(false))
ws.afterCommand(state)
@ -1269,7 +1268,7 @@ private[sbt] object ContinuousCommands {
state
}
private[sbt] def stopWatchImpl(channelName: String): Unit = {
StandardMain.exchange.channelForName(channelName).foreach(_.terminal.setPrompt(Prompt.Running))
StandardMain.exchange.unprompt(ConsoleUnpromptEvent(Some(CommandSource(channelName))), false)
Option(watchStates.get(channelName)).foreach { ws =>
ws.afterWatch()
ws.callbacks.onExit()