From 2bf6a8b0bf16a15978d71a71562b50045215217d Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 23 Nov 2020 14:46:42 -0800 Subject: [PATCH] Merge pull request #6166 from eatkins/watch-prompt-fix Fix watch shell option --- main/src/main/scala/sbt/MainLoop.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/main/src/main/scala/sbt/MainLoop.scala b/main/src/main/scala/sbt/MainLoop.scala index 1943bc083..384b05cf2 100644 --- a/main/src/main/scala/sbt/MainLoop.scala +++ b/main/src/main/scala/sbt/MainLoop.scala @@ -222,11 +222,9 @@ object MainLoop { val (restoreTerminal, termState) = channelName.flatMap(exchange.channelForName) match { case Some(c) => val prevTerminal = ITerminal.set(c.terminal) - val prevPrompt = c.terminal.prompt // temporarily set the prompt to running during task evaluation c.terminal.setPrompt(Prompt.Running) (() => { - if (c.terminal.prompt != Prompt.Watch) c.terminal.setPrompt(prevPrompt) ITerminal.set(prevTerminal) c.terminal.flush() }) -> progressState.put(Keys.terminalKey, Terminal(c.terminal))