From f8c40ea5b38828c051ee0ad389c77eda6a761e12 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sun, 15 Sep 2019 11:20:33 -0700 Subject: [PATCH 1/3] Add consoleQuick to skipReportTasks This was an oversight that caused consoleQuick to not work with supershell. We should probably try to figure out a way to allow custom tasks to black list themselves from super shell reporting. --- main/src/main/scala/sbt/internal/TaskProgress.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/internal/TaskProgress.scala b/main/src/main/scala/sbt/internal/TaskProgress.scala index e249076f6..7c0b5d884 100644 --- a/main/src/main/scala/sbt/internal/TaskProgress.scala +++ b/main/src/main/scala/sbt/internal/TaskProgress.scala @@ -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") private[this] def report(): Unit = { val currentTasks = activeTasks.toVector val ltc = lastTaskCount.get From 041904f9b68a3f56bd74109f48320d6359a9e025 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sun, 15 Sep 2019 11:42:41 -0700 Subject: [PATCH 2/3] Skip state in task progress In the `watch` input task, which is an alternative to `~`, with super shell, there would be a solitary progress line for `state` in between builds. --- main/src/main/scala/sbt/internal/TaskProgress.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/internal/TaskProgress.scala b/main/src/main/scala/sbt/internal/TaskProgress.scala index 7c0b5d884..e579b5226 100644 --- a/main/src/main/scala/sbt/internal/TaskProgress.scala +++ b/main/src/main/scala/sbt/internal/TaskProgress.scala @@ -71,7 +71,7 @@ private[sbt] final class TaskProgress(log: ManagedLogger) stop() } private[this] val skipReportTasks = - Set("run", "bgRun", "fgRun", "scala", "console", "consoleProject", "consoleQuick") + 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))) + } } From 577070c79fac3acb5fcbd350e953be6f83f1752c Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sun, 15 Sep 2019 11:41:07 -0700 Subject: [PATCH 3/3] Improve formatting in Continuous --- main/src/main/scala/sbt/internal/Continuous.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala index e2d2143da..34b37f443 100644 --- a/main/src/main/scala/sbt/internal/Continuous.scala +++ b/main/src/main/scala/sbt/internal/Continuous.scala @@ -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]]](