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

Cleanup implementation of progress report 

It was a bit cleaner to consolidate `extra` and
(previousLines|info).length into prevLength and currentLength.
This commit is contained in:
Ethan Atkins 2019-09-24 16:33:40 -07:00
parent 0b18ccebbd
commit 5cfab4c9a9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
View File

@ -373,20 +373,19 @@ class ConsoleAppender private[ConsoleAppender] (
} }
val width = ConsoleAppender.terminalWidth val width = ConsoleAppender.terminalWidth
val extra: Int = info.foldLeft(0)(_ + terminalLines(width)(_)) val currentLength = info.foldLeft(info.length)(_ + terminalLines(width)(_))
val previousLines = progressLines.getAndSet(info) val previousLines = progressLines.getAndSet(info)
val prevExtra = previousLines.foldLeft(0)(_ + terminalLines(width)(_)) val prevLength = previousLines.foldLeft(previousLines.length)(_ + terminalLines(width)(_))
val prevPadding = padding.get val prevPadding = padding.get
val newPadding = val newPadding = math.max(0, prevLength + prevPadding - currentLength)
math.max(0, previousLines.length + prevExtra + prevPadding - info.length - extra)
padding.set(newPadding) padding.set(newPadding)
deleteConsoleLines(newPadding) deleteConsoleLines(newPadding)
deleteConsoleLines(blankZone) deleteConsoleLines(blankZone)
info.foreach(i => out.println(i)) info.foreach(i => out.println(i))
out.print(cursorUp(blankZone + info.length + newPadding + extra)) out.print(cursorUp(blankZone + currentLength + newPadding))
out.flush() out.flush()
} }
private def terminalLines(width: Int): String => Int = private def terminalLines(width: Int): String => Int =