Various highlight fixes

Author: nicolasstucki

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -346,7 +346,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case id: Trees.SearchFailureIdent[_] =>
         tree.typeOpt match {
           case reason: Implicits.SearchFailureType =>
-            toText(id.name) ~ "implicitly" ~ toText(reason.expectedType) ~ "]"
+            toText(id.name) ~ "implicitly[" ~ toText(reason.expectedType) ~ "]"
           case _ =>
             toText(id.name)
         }
@@ -411,7 +411,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         if (sel.isEmpty) blockText(cases)
         else changePrec(GlobalPrec) { toText(sel) ~ keywordStr(" match ") ~ blockText(cases) }
       case CaseDef(pat, guard, body) =>
-        keywordStr("case ") ~ inPattern(toText(pat)) ~ optText(guard)(" if " ~ _) ~ " => " ~ caseBlockText(body)
+        keywordStr("case ") ~ inPattern(toText(pat)) ~ optText(guard)(keywordStr(" if ") ~ _) ~ " => " ~ caseBlockText(body)
       case Return(expr, from) =>
         changePrec(GlobalPrec) { keywordStr("return") ~ optText(expr)(" " ~ _) }
       case Try(expr, cases, finalizer) =>

compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala

@@ -17,7 +17,7 @@ object SyntaxHighlighting {
   val KeywordColor    = Console.YELLOW
   val ValDefColor     = Console.CYAN
   val LiteralColor    = Console.RED
-  val StringColor    = Console.GREEN
+  val StringColor     = Console.GREEN
   val TypeColor       = Console.MAGENTA
   val AnnotationColor = Console.MAGENTA
 

compiler/src/dotty/tools/dotc/util/DiffUtil.scala

@@ -7,23 +7,25 @@ object DiffUtil {
 
   val EOF = new String("EOF") // Unique string up to reference
 
+  val ansiColorToken = '\u001b'
+
   @tailrec private def splitTokens(str: String, acc: List[String] = Nil): List[String] = {
       if (str == "") {
         acc.reverse
       } else {
         val head = str.charAt(0)
         val (token, rest) =
-          if (head == '\u001b') { // ansi color token
+          if (head == ansiColorToken) { // ansi color token
             val splitIndex = str.indexOf('m') + 1
             (str.substring(0, splitIndex), str.substring(splitIndex))
           } else if (Character.isAlphabetic(head) || Character.isDigit(head)) {
-            str.span(c => Character.isAlphabetic(c) || Character.isDigit(c) && c != '\u001b')
+            str.span(c => Character.isAlphabetic(c) || Character.isDigit(c) && c != ansiColorToken)
           } else if (Character.isMirrored(head) || Character.isWhitespace(head)) {
             str.splitAt(1)
           } else {
             str.span { c =>
               !Character.isAlphabetic(c) && !Character.isDigit(c) &&
-                !Character.isMirrored(c) && !Character.isWhitespace(c) && c != '\u001b'
+                !Character.isMirrored(c) && !Character.isWhitespace(c) && c != ansiColorToken
             }
           }
         splitTokens(rest, token :: acc)