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

Merge pull request #223 from eatkins/terminal-width 

Take terminal width into account in supershell
This commit is contained in:
Ethan Atkins 2019-09-24 12:03:36 -07:00 committed by GitHub
parent 6fc614bb46 7597cdb19b
commit 0b18ccebbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,9 +346,11 @@ class ConsoleAppender private[ConsoleAppender] (
out.println(s"$DeleteLine$l")
if (progress.length > 0) {
val pad = if (padding.get > 0) padding.decrementAndGet() else 0
val width = ConsoleAppender.terminalWidth
val len: Int = progress.foldLeft(progress.length)(_ + terminalLines(width)(_))
deleteConsoleLines(blankZone + pad)
progress.foreach(out.println)
out.print(cursorUp(blankZone + progress.length + padding.get))
out.print(cursorUp(blankZone + len + padding.get))
}
}
out.flush()
@ -370,18 +372,25 @@ class ConsoleAppender private[ConsoleAppender] (
s"$DeleteLine | => ${item.name} ${elapsed}s"
}
val width = ConsoleAppender.terminalWidth
val extra: Int = info.foldLeft(0)(_ + terminalLines(width)(_))
val previousLines = progressLines.getAndSet(info)
val prevExtra = previousLines.foldLeft(0)(_ + terminalLines(width)(_))
val prevPadding = padding.get
val newPadding = math.max(0, previousLines.length + prevPadding - info.length)
val newPadding =
math.max(0, previousLines.length + prevExtra + prevPadding - info.length - extra)
padding.set(newPadding)
deleteConsoleLines(newPadding)
deleteConsoleLines(blankZone)
info.foreach(i => out.println(i))
out.print(cursorUp(blankZone + info.length + newPadding))
out.print(cursorUp(blankZone + info.length + newPadding + extra))
out.flush()
}
private def terminalLines(width: Int): String => Int =
(progressLine: String) => (progressLine.length - 1) / width
private def deleteConsoleLines(n: Int): Unit = {
(1 to n) foreach { _ =>
out.println(DeleteLine)