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

Merge pull request #5966 from eatkins/piped-output-fix 

Remove ansi control characters from piped output
This commit is contained in:
eugene yokota 2020-10-10 20:13:39 -04:00 committed by GitHub
parent bfb7d4019b 40752ff67a
commit aec55af083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,9 +91,9 @@ private[sbt] final class ProgressState(
printStream: PrintStream, printStream: PrintStream,
hasProgress: Boolean hasProgress: Boolean
): Unit = { ): Unit = {
val canClearPrompt = currentLineBytes.get.isEmpty
addBytes(terminal, bytes)
if (hasProgress) { if (hasProgress) {
val canClearPrompt = currentLineBytes.get.isEmpty
addBytes(terminal, bytes)
val toWrite = new ArrayBuffer[Byte] val toWrite = new ArrayBuffer[Byte]
terminal.prompt match { terminal.prompt match {
case a: Prompt.AskUser if a.render.nonEmpty && canClearPrompt => case a: Prompt.AskUser if a.render.nonEmpty && canClearPrompt =>

2
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -331,7 +331,7 @@ object Terminal {
private[sbt] def withStreams[T](isServer: Boolean)(f: => T): T = private[sbt] def withStreams[T](isServer: Boolean)(f: => T): T =
// In ci environments, don't touch the io streams unless run with -Dsbt.io.virtual=true // In ci environments, don't touch the io streams unless run with -Dsbt.io.virtual=true
if (System.getProperty("sbt.io.virtual", "") == "true" || (logFormatEnabled.getOrElse(true) && !isCI)) { if (System.getProperty("sbt.io.virtual", "") == "true" || (logFormatEnabled.getOrElse(true) && !isCI)) {
hasProgress.set(isServer) hasProgress.set(isServer && formatEnabledInEnv)
consoleTerminalHolder.set(newConsoleTerminal()) consoleTerminalHolder.set(newConsoleTerminal())
activeTerminal.set(consoleTerminalHolder.get) activeTerminal.set(consoleTerminalHolder.get)
try withOut(withIn(f)) try withOut(withIn(f))