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

Merge pull request #6170 from eatkins/1.4.x-6166-backport 

[1.4.x] backport #6166 Fix watch shell option
This commit is contained in:
Ethan Atkins 2020-11-25 12:05:43 -08:00 committed by GitHub
parent 8a1f53d87b 2bf6a8b0bf
commit 1a1cca3cd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/MainLoop.scala
View File

@ -222,11 +222,9 @@ object MainLoop {
val (restoreTerminal, termState) = channelName.flatMap(exchange.channelForName) match { val (restoreTerminal, termState) = channelName.flatMap(exchange.channelForName) match {
case Some(c) => case Some(c) =>
val prevTerminal = ITerminal.set(c.terminal) val prevTerminal = ITerminal.set(c.terminal)
val prevPrompt = c.terminal.prompt
// temporarily set the prompt to running during task evaluation // temporarily set the prompt to running during task evaluation
c.terminal.setPrompt(Prompt.Running) c.terminal.setPrompt(Prompt.Running)
(() => { (() => {
if (c.terminal.prompt != Prompt.Watch) c.terminal.setPrompt(prevPrompt)
ITerminal.set(prevTerminal) ITerminal.set(prevTerminal)
c.terminal.flush() c.terminal.flush()
}) -> progressState.put(Keys.terminalKey, Terminal(c.terminal)) }) -> progressState.put(Keys.terminalKey, Terminal(c.terminal))