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

Merge branch 'pr/3321' into wip/integration

This commit is contained in:
Eugene Yokota 2017-07-15 17:53:21 -04:00
parent c909de01b8 3fe068a4c1
commit 3cc49e49f4
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main-command/src/main/scala/sbt/Highlight.scala
View File

@ -9,7 +9,7 @@ object Highlight {
def showMatches(pattern: Pattern)(line: String): Option[String] = {
val matcher = pattern.matcher(line)
if (ConsoleAppender.formatEnabled) {
if (ConsoleAppender.formatEnabledInEnv) {
// ANSI codes like \033[39m (normal text color) don't work on Windows
val highlighted = matcher.replaceAll(scala.Console.RED + "$0" + RESET)
if (highlighted == line) None else Some(highlighted)
@ -19,5 +19,5 @@ object Highlight {
None
}
def bold(s: String) =
if (ConsoleAppender.formatEnabled) BOLD + s.replace(RESET, RESET + BOLD) + RESET else s
if (ConsoleAppender.formatEnabledInEnv) BOLD + s.replace(RESET, RESET + BOLD) + RESET else s
}

2
main-settings/src/main/scala/sbt/Def.scala
View File

@ -68,7 +68,7 @@ object Def extends Init[Scope] with TaskMacroExtra {
Scope.displayMasked(scoped.scope, scoped.key.label, mask)
def withColor(s: String, color: Option[String]): String = {
val useColor = ConsoleAppender.formatEnabled
val useColor = ConsoleAppender.formatEnabledInEnv
color match {
case Some(c) if useColor => c + s + scala.Console.RESET
case _ => s

8
main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala
View File

@ -145,10 +145,10 @@ object OnlyTaskDynLinterDSL extends BaseTaskLinterDSL {
}
object TaskLinterDSLFeedback {
private final val startBold = if (ConsoleAppender.formatEnabled) AnsiColor.BOLD else ""
private final val startRed = if (ConsoleAppender.formatEnabled) AnsiColor.RED else ""
private final val startGreen = if (ConsoleAppender.formatEnabled) AnsiColor.GREEN else ""
private final val reset = if (ConsoleAppender.formatEnabled) AnsiColor.RESET else ""
private final val startBold = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.BOLD else ""
private final val startRed = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.RED else ""
private final val startGreen = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.GREEN else ""
private final val reset = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.RESET else ""
private final val ProblemHeader = s"${startRed}Problem${reset}"
private final val SolutionHeader = s"${startGreen}Solution${reset}"

7
main/src/main/scala/sbt/internal/LogManager.scala
View File

@ -164,10 +164,11 @@ object LogManager {
): SuppressedTraceContext => Option[String] = {
lazy val display = Project.showContextKey(state)
def commandBase = "last " + display.show(unwrapStreamsKey(key))
def command(useColor: Boolean) =
if (useColor) BLUE + commandBase + RESET else s"'$commandBase'"
def command(useFormat: Boolean) =
if (useFormat) BLUE + commandBase + RESET else s"'$commandBase'"
context =>
Some("Stack trace suppressed: run %s for the full output.".format(command(context.useColor)))
Some(
"Stack trace suppressed: run %s for the full output.".format(command(context.useFormat)))
}
def unwrapStreamsKey(key: ScopedKey[_]): ScopedKey[_] = key.scope.task match {