Merge pull request #5125 from eatkins/progress-improvements

Progress improvements

main/src/main/scala/sbt/EvaluateTask.scala

@@ -224,13 +224,15 @@ object EvaluateTask {
       structure: BuildStructure,
       state: State
   ): ExecuteProgress[Task] = {
+    state.get(currentTaskProgress).map(_.progress).getOrElse {
       val maker: Seq[Keys.TaskProgress] = getSetting(
         Keys.progressReports,
         Seq(),
         extracted,
         structure
       )
-    val progressReporter = extracted.get(progressState in ThisBuild).map { ps =>
+      val progressReporter = extracted.getOpt(progressState in ThisBuild).flatMap {
+        case Some(ps) =>
           ps.reset()
           ConsoleAppender.setShowProgress(true)
           val appender = MainAppender.defaultScreen(StandardMain.console)
@@ -239,7 +241,8 @@ object EvaluateTask {
             case _                  =>
           }
           val log = LogManager.progressLogger(appender)
-      new TaskProgress(log)
+          Some(new TaskProgress(log))
+        case _ => None
       }
       val reporters = maker.map(_.progress) ++ progressReporter ++
         (if (SysProp.taskTimings) new TaskTimings(reportOnShutdown = false) :: Nil else Nil)
@@ -249,6 +252,7 @@ object EvaluateTask {
         case xs                 => ExecuteProgress.aggregate[Task](xs)
       }
     }
+  }
   // TODO - Should this pull from Global or from the project itself?
   private[sbt] def forcegc(extracted: Extracted, structure: BuildStructure): Boolean =
     getSetting(Keys.forcegc in Global, GCUtil.defaultForceGarbageCollection, extracted, structure)

main/src/main/scala/sbt/Keys.scala

@@ -482,6 +482,7 @@ object Keys {
   object TaskProgress {
     def apply(progress: ExecuteProgress[Task]): TaskProgress = new TaskProgress(progress)
   }
+  private[sbt] val currentTaskProgress = AttributeKey[TaskProgress]("current-task-progress")
   val useSuperShell = settingKey[Boolean]("Enables (true) or disables the super shell.")
   val turbo = settingKey[Boolean]("Enables (true) or disables optional performance features.")
   // This key can be used to add custom ExecuteProgress instances

main/src/main/scala/sbt/MainLoop.scala

@@ -179,10 +179,18 @@ object MainLoop {
     val channelName = exec.source map (_.channelName)
     StandardMain.exchange publishEventMessage
       ExecStatusEvent("Processing", channelName, exec.execId, Vector())
-
     try {
       def process(): State = {
-        val newState = Command.process(exec.commandLine, state)
+        val progressState = state.get(sbt.Keys.currentTaskProgress) match {
+          case Some(_) => state
+          case _ =>
+            if (state.get(Keys.stateBuildStructure).isDefined) {
+              val extracted = Project.extract(state)
+              val progress = EvaluateTask.executeProgress(extracted, extracted.structure, state)
+              state.put(sbt.Keys.currentTaskProgress, new Keys.TaskProgress(progress))
+            } else state
+        }
+        val newState = Command.process(exec.commandLine, progressState)
         if (exec.commandLine.contains("session"))
           newState.get(hasCheckedMetaBuild).foreach(_.set(false))
         val doneEvent = ExecStatusEvent(
@@ -198,7 +206,8 @@ object MainLoop {
         } else { // send back a notification
           StandardMain.exchange publishEventMessage doneEvent
         }
-        newState
+        newState.get(sbt.Keys.currentTaskProgress).foreach(_.progress.stop())
+        newState.remove(sbt.Keys.currentTaskProgress)
       }
       // The split on space is to handle 'reboot full' and 'reboot'.
       state.currentCommand.flatMap(_.commandLine.trim.split(" ").headOption) match {

main/src/main/scala/sbt/internal/TaskProgress.scala

@@ -73,7 +73,7 @@ private[sbt] final class TaskProgress(log: ManagedLogger)
   private[this] val skipReportTasks =
     Set("run", "bgRun", "fgRun", "scala", "console", "consoleProject", "consoleQuick", "state")
   private[this] def report(): Unit = {
-    val currentTasks = activeTasks.toVector
+    val currentTasks = activeTasks.toVector.filterNot(Def.isDummy)
     val ltc = lastTaskCount.get
     val currentTasksCount = currentTasks.size
     def report0(): Unit = {