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

Drop (out-X) from the log output 

Fixes sbt/sbt#3056
This commit is contained in:
Dale Wijnand 2017-04-04 14:14:31 +01:00
parent add9bd2f4d
commit d088d16d78
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,16 +177,19 @@ object ConsoleAppender {
private[this] def os = System.getProperty("os.name") private[this] def os = System.getProperty("os.name")
private[this] def isWindows = os.toLowerCase(Locale.ENGLISH).indexOf("windows") >= 0 private[this] def isWindows = os.toLowerCase(Locale.ENGLISH).indexOf("windows") >= 0
def apply(out: PrintStream): ConsoleAppender = apply(generateName, ConsoleOut.printStreamOut(out)) def apply(out: PrintStream): ConsoleAppender = apply(ConsoleOut.printStreamOut(out))
def apply(out: PrintWriter): ConsoleAppender = apply(generateName, ConsoleOut.printWriterOut(out)) def apply(out: PrintWriter): ConsoleAppender = apply(ConsoleOut.printWriterOut(out))
def apply(): ConsoleAppender = apply(generateName, ConsoleOut.systemOut) def apply(): ConsoleAppender = apply(ConsoleOut.systemOut)
def apply(name: String): ConsoleAppender = apply(name, ConsoleOut.systemOut, formatEnabled, formatEnabled, noSuppressedMessage) def apply(name: String): ConsoleAppender = apply(name, ConsoleOut.systemOut)
def apply(out: ConsoleOut): ConsoleAppender = apply(generateName, out, formatEnabled, formatEnabled, noSuppressedMessage) def apply(out: ConsoleOut): ConsoleAppender = apply(generateName, out)
def apply(name: String, out: ConsoleOut): ConsoleAppender = apply(name, out, formatEnabled, formatEnabled, noSuppressedMessage) def apply(name: String, out: ConsoleOut): ConsoleAppender = apply(name, out, formatEnabled)
def apply(name: String, out: ConsoleOut, suppressedMessage: SuppressedTraceContext => Option[String]): ConsoleAppender = def apply(name: String, out: ConsoleOut, suppressedMessage: SuppressedTraceContext => Option[String]): ConsoleAppender =
apply(name, out, formatEnabled, formatEnabled, suppressedMessage) apply(name, out, formatEnabled, formatEnabled, suppressedMessage)
def apply(name: String, out: ConsoleOut, useColor: Boolean): ConsoleAppender = def apply(name: String, out: ConsoleOut, useColor: Boolean): ConsoleAppender =
apply(name, out, formatEnabled, useColor, noSuppressedMessage) apply(name, out, formatEnabled, useColor, noSuppressedMessage)
def apply(name: String, out: ConsoleOut, ansiCodesSupported: Boolean, def apply(name: String, out: ConsoleOut, ansiCodesSupported: Boolean,
useColor: Boolean, suppressedMessage: SuppressedTraceContext => Option[String]): ConsoleAppender = useColor: Boolean, suppressedMessage: SuppressedTraceContext => Option[String]): ConsoleAppender =
{ {
@ -194,8 +197,9 @@ object ConsoleAppender {
appender.start appender.start
appender appender
} }
def generateName: String =
"out-" + generateId.incrementAndGet def generateName: String = "out-" + generateId.incrementAndGet
private val generateId: AtomicInteger = new AtomicInteger private val generateId: AtomicInteger = new AtomicInteger
private[this] val EscapeSequence = (27.toChar + "[^@-~]*[@-~]").r private[this] val EscapeSequence = (27.toChar + "[^@-~]*[@-~]").r
@ -322,7 +326,6 @@ class ConsoleAppender private[ConsoleAppender] (
setColor(messageColor) setColor(messageColor)
out.print(line) out.print(line)
reset() reset()
out.print(s" ($name)")
out.println() out.println()
} }
} }