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

Account for log line longer than the terminal width 

widthHolder will hold on to the terminal width if supplied by sbt.
This avoids adding dependencies to JLine.
This commit is contained in:
Eugene Yokota 2019-03-07 16:42:10 -05:00
parent 8c85744d67
commit 8215026bc3
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,8 +97,14 @@ class ConsoleLogger private[ConsoleLogger] (
object ConsoleAppender {
private[sbt] final val ScrollUp = "\u001B[S"
private[sbt] def cursorUp(n: Int): String = s"\u001B[${n}A"
private[sbt] def cursorDown(n: Int): String = s"\u001B[${n}B"
private[sbt] def scrollUp(n: Int): String = s"\u001B[${n}S"
private[sbt] final val DeleteLine = "\u001B[2K"
private[sbt] final val CursorLeft1000 = "\u001B[1000D"
private[this] val widthHolder: AtomicInteger = new AtomicInteger
private[sbt] def terminalWidth = widthHolder.get
private[sbt] def setTerminalWidth(n: Int): Unit = widthHolder.set(n)
/** Hide stack trace altogether. */
val noSuppressedMessage = (_: SuppressedTraceContext) => None
@ -463,7 +469,18 @@ class ConsoleAppender private[ConsoleAppender] (
if (!useFormat || !ansiCodesSupported) {
out.println(EscHelpers.removeEscapeSequences(msg))
} else if (ConsoleAppender.showProgress) {
out.print(s"$ScrollUp$DeleteLine$msg${CursorLeft1000}")
val textLength = msg.length - 5
val scrollNum =
if (ConsoleAppender.terminalWidth == 0) 1
else (textLength / ConsoleAppender.terminalWidth) + 1
if (scrollNum > 1) {
out.print(s"${cursorDown(1)}$DeleteLine" * (scrollNum - 1) + s"${cursorUp(scrollNum - 1)}")
}
out.print(
s"$ScrollUp$DeleteLine$msg${CursorLeft1000}" + (
if (scrollNum <= 1) ""
else scrollUp(scrollNum - 1)
))
out.flush()
} else {
out.println(msg)