From cd65543d105402a5ea4457da2ad5cbbbc9b0aa17 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 12 Dec 2019 08:44:10 -0800 Subject: [PATCH] Deprecate unused ConsoleUnpromptEvent --- .../src/main/scala/sbt/internal/CommandChannel.scala | 1 + .../src/main/scala/sbt/internal/ConsoleChannel.scala | 12 ------------ main/src/main/scala/sbt/Main.scala | 7 +++---- .../main/scala/sbt/internal/CommandExchange.scala | 4 ---- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/main-command/src/main/scala/sbt/internal/CommandChannel.scala b/main-command/src/main/scala/sbt/internal/CommandChannel.scala index 9a0c932f0..fb40245df 100644 --- a/main-command/src/main/scala/sbt/internal/CommandChannel.scala +++ b/main-command/src/main/scala/sbt/internal/CommandChannel.scala @@ -62,4 +62,5 @@ case class ConsolePromptEvent(state: State) extends EventMessage /* * This is a data passed specifically for unprompting local console. */ +@deprecated("No longer used", "1.4.0") case class ConsoleUnpromptEvent(lastSource: Option[CommandSource]) extends EventMessage diff --git a/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala b/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala index 3c23e97b2..12c4bfcce 100644 --- a/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala +++ b/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala @@ -51,18 +51,6 @@ private[sbt] final class ConsoleChannel(val name: String) extends CommandChannel askUserThread = Some(x) x.start() } - case e: ConsoleUnpromptEvent => - e.lastSource match { - case Some(src) if src.channelName != name => - askUserThread match { - case Some(_) => - // keep listening while network-origin command is running - // make sure to test Windows and Cygwin, if you uncomment - // shutdown() - case _ => - } - case _ => - } case _ => // } diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index 639a89427..4e0d31084 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -9,7 +9,7 @@ package sbt import java.io.{ File, IOException } import java.net.URI -import java.nio.file.{ FileAlreadyExistsException, Files, FileSystems } +import java.nio.file.{ FileAlreadyExistsException, FileSystems, Files } import java.util.concurrent.ForkJoinPool import java.util.concurrent.atomic.AtomicBoolean import java.util.{ Locale, Properties } @@ -23,7 +23,7 @@ import sbt.internal._ import sbt.internal.inc.ScalaInstance import sbt.internal.util.Types.{ const, idFun } import sbt.internal.util._ -import sbt.internal.util.complete.{ SizeParser, Parser } +import sbt.internal.util.complete.{ Parser, SizeParser } import sbt.io._ import sbt.io.syntax._ import sbt.util.{ Level, Logger, Show } @@ -888,7 +888,7 @@ object BuiltinCommands { } def shell: Command = Command.command(Shell, Help.more(Shell, ShellDetailed)) { s0 => - import sbt.internal.{ ConsolePromptEvent, ConsoleUnpromptEvent } + import sbt.internal.ConsolePromptEvent val exchange = StandardMain.exchange val welcomeState = displayWelcomeBanner(s0) val s1 = exchange run welcomeState @@ -904,7 +904,6 @@ object BuiltinCommands { remainingCommands = exec +: Exec(Shell, None) +: s1.remainingCommands ) .setInteractive(true) - exchange publishEventMessage ConsoleUnpromptEvent(exec.source) if (exec.commandLine.trim.isEmpty) newState else newState.clearGlobalLog } diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala index 461b538e5..45421ac0f 100644 --- a/main/src/main/scala/sbt/internal/CommandExchange.scala +++ b/main/src/main/scala/sbt/internal/CommandExchange.scala @@ -364,10 +364,6 @@ private[sbt] final class CommandExchange { channels collect { case c: ConsoleChannel => c.publishEventMessage(entry) } - case entry: ConsoleUnpromptEvent => - channels collect { - case c: ConsoleChannel => c.publishEventMessage(entry) - } case entry: ExecStatusEvent => channels collect { case c: ConsoleChannel =>