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

Merge pull request #5087 from eatkins/1.3.x-supershell-blacklist 

[1.3.x] Add consoleQuick and state to skipReportTasks
This commit is contained in:
Ethan Atkins 2019-09-16 18:40:06 -07:00 committed by GitHub
parent 8a161069dd 577070c79f
commit 204351990c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,9 +117,7 @@ private[sbt] object Continuous extends DeprecatedContinuous {
private[sbt] def continuousTask: Def.Initialize[InputTask[StateTransform]] =
Def.inputTask {
val (initialCount, commands) = continuousParser.parsed
new StateTransform(
runToTermination(state.value, commands, initialCount, isCommand = false)
)
new StateTransform(runToTermination(state.value, commands, initialCount, isCommand = false))
}
private[sbt] val dynamicInputs = taskKey[Option[mutable.Set[DynamicInput]]](

7
main/src/main/scala/sbt/internal/TaskProgress.scala
View File

@ -71,7 +71,7 @@ private[sbt] final class TaskProgress(log: ManagedLogger)
stop()
}
private[this] val skipReportTasks =
Set("run", "bgRun", "fgRun", "scala", "console", "consoleProject")
Set("run", "bgRun", "fgRun", "scala", "console", "consoleProject", "consoleQuick", "state")
private[this] def report(): Unit = {
val currentTasks = activeTasks.toVector
val ltc = lastTaskCount.get
@ -97,8 +97,9 @@ private[sbt] final class TaskProgress(log: ManagedLogger)
lastTaskCount.set(currentTasksCount)
}
private[this] def containsSkipTasks(tasks: Vector[Task[_]]): Boolean =
private[this] def containsSkipTasks(tasks: Vector[Task[_]]): Boolean = {
tasks
.map(t => taskName(t))
.exists(n => skipReportTasks.exists(m => n.endsWith("/ " + m)))
.exists(n => skipReportTasks.exists(m => m == n || n.endsWith("/ " + m)))
}
}