Add color to severity in REPL reporter

puffnfresh · puffnfresh · commit 8a560a2806ca · 2014-09-24T18:56:54.000-06:00
* Errors are red
* Warnings are yellow
diff --git a/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
@@ -29,7 +29,7 @@ class ConsoleReporter(val settings: Settings, reader: BufferedReader, writer: Pr
     case INFO    => null
   }
 
-  private def clabel(severity: Severity): String = {
+  protected def clabel(severity: Severity): String = {
     val label0 = label(severity)
     if (label0 eq null) "" else label0 + ": "
   }
diff --git a/src/repl/scala/tools/nsc/interpreter/ReplReporter.scala b/src/repl/scala/tools/nsc/interpreter/ReplReporter.scala
@@ -32,6 +32,24 @@ class ReplReporter(intp: IMain) extends ConsoleReporter(intp.settings, Console.i
   override def warning(pos: Position, msg: String): Unit = withoutTruncating(super.warning(pos, msg))
   override def error(pos: Position, msg: String): Unit   = withoutTruncating(super.error(pos, msg))
 
+  import scala.io.AnsiColor.{ RED, YELLOW, RESET }
+
+  def severityColor(severity: Severity): String = severity match {
+    case ERROR   => RED
+    case WARNING => YELLOW
+    case INFO    => RESET
+  }
+
+  override def print(pos: Position, msg: String, severity: Severity) {
+    val prefix = (
+      if (replProps.colorOk)
+        severityColor(severity) + clabel(severity) + RESET
+      else
+        clabel(severity)
+    )
+    printMessage(pos, prefix + msg)
+  }
+
   override def printMessage(msg: String) {
     // Avoiding deadlock if the compiler starts logging before
     // the lazy val is complete.

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ConsoleReporter(val settings: Settings, reader: BufferedReader, writer: Pr`
`29`	`29`	`case INFO => null`
`30`	`30`	`}`
`31`	`31`
`32`		`- private def clabel(severity: Severity): String = {`
	`32`	`+ protected def clabel(severity: Severity): String = {`
`33`	`33`	`val label0 = label(severity)`
`34`	`34`	`if (label0 eq null) "" else label0 + ": "`
`35`	`35`	`}`