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

Merge pull request #6112 from eatkins/supershell-interlace 

Fix supershell line interlacing with logs
This commit is contained in:
eugene yokota 2020-11-18 15:15:19 -05:00 committed by GitHub
parent 94dc172ab6 85d17889b6
commit 1ea0fb7d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/util-logging/src/main/scala/sbt/internal/util/ProgressState.scala
View File

@ -100,7 +100,10 @@ private[sbt] final class ProgressState(
toWrite ++= (DeleteLine + ClearScreenAfterCursor + CursorLeft1000).getBytes("UTF-8")
case _ =>
}
toWrite ++= bytes
bytes.foreach { b =>
if (b == 10) toWrite ++= ClearScreenAfterCursor.getBytes("UTF-8")
toWrite += b
}
toWrite ++= ClearScreenAfterCursor.getBytes("UTF-8")
if (bytes.endsWith(lineSeparatorBytes)) {
if (progressLines.get.nonEmpty) {