Merge pull request #228 from eatkins/1.3.x-delete-line-count-backport

eed3si9n · web-flow · commit a119b51d5a3d · 2019-10-11T20:58:10.000+02:00
[1.3.x] Don't include DeleteLine in progress length backport
diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
@@ -349,13 +349,18 @@ class ConsoleAppender private[ConsoleAppender] (
         val width = ConsoleAppender.terminalWidth
         val len: Int = progress.foldLeft(progress.length)(_ + terminalLines(width)(_))
         deleteConsoleLines(blankZone + pad)
-        progress.foreach(out.println)
+        progress.foreach(printProgressLine)
         out.print(cursorUp(blankZone + len + padding.get))
       }
     }
     out.flush()
   }
 
+  private def printProgressLine(line: String): Unit = {
+    out.print(DeleteLine)
+    out.println(line)
+  }
+
   /**
    * Receives a new task report and replaces the old one. In the event that the new
    * report has fewer lines than the previous report, padding lines are added on top
@@ -369,7 +374,7 @@ class ConsoleAppender private[ConsoleAppender] (
     val sorted = pe.items.sortBy(x => x.elapsedMicros)
     val info = sorted map { item =>
       val elapsed = item.elapsedMicros / 1000000L
-      s"$DeleteLine  | => ${item.name} ${elapsed}s"
+      s"  | => ${item.name} ${elapsed}s"
     }
 
     val width = ConsoleAppender.terminalWidth
@@ -383,7 +388,7 @@ class ConsoleAppender private[ConsoleAppender] (
 
     deleteConsoleLines(newPadding)
     deleteConsoleLines(blankZone)
-    info.foreach(i => out.println(i))
+    info.foreach(printProgressLine)
 
     out.print(cursorUp(blankZone + currentLength + newPadding))
     out.flush()
