mirror of https://github.com/sbt/sbt.git
Deprecate unused ConsoleUnpromptEvent
This commit is contained in:
parent
2f4c603be6
commit
cd65543d10
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 _ => //
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 =>
|
||||
|
|
|
|||
Loading…
Reference in New Issue