Fix rebase breakages

Author: allanrenucci

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

@@ -27,16 +27,12 @@ object SyntaxHighlighting {
   val TypeColor       = Console.MAGENTA
   val AnnotationColor = Console.MAGENTA
 
-  private class NoReporter extends Reporter {
-    override def doReport(m: MessageContainer)(implicit ctx: Context): Unit = ()
-  }
-
   def highlight(in: String)(implicit ctx: Context): String = {
-    def freshCtx = ctx.fresh.setReporter(new NoReporter)
+    def freshCtx = ctx.fresh.setReporter(Reporter.NoReporter)
     if (in.isEmpty || ctx.settings.color.value == "never") in
     else {
       implicit val ctx = freshCtx
-      val source = new SourceFile("<highlighting>", in.toCharArray)
+      val source = new SourceFile("<highlighting>", in)
       val colorAt = Array.fill(in.length)(NoColor)
 
       def highlightRange(from: Int, to: Int, color: String) =

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -62,7 +62,7 @@ trait MessageRendering {
 
     val syntax =
       if (ctx.settings.color.value != "never")
-        SyntaxHighlighting.highlight(new String(pos.linesSlice)).toArray
+        SyntaxHighlighting.highlight(new String(pos.linesSlice)).toCharArray
       else pos.linesSlice
     val lines = linesFrom(syntax)
     val (before, after) = pos.beforeAndAfterPoint

compiler/src/dotty/tools/repl/JLineTerminal.scala

@@ -63,9 +63,9 @@ final class JLineTerminal extends java.io.Closeable {
   def close() = terminal.close()
 
   /** Provide syntax highlighting */
-  private class Highlighter extends reader.Highlighter {
+  private class Highlighter(implicit ctx: Context) extends reader.Highlighter {
     def highlight(reader: LineReader, buffer: String): AttributedString = {
-      val highlighted = SyntaxHighlighting(buffer).mkString
+      val highlighted = SyntaxHighlighting.highlight(buffer)
       AttributedString.fromAnsi(highlighted)
     }
   }

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -320,7 +320,7 @@ class ReplDriver(settings: Array[String],
 
     case Imports =>
       implicit val ctx = state.context
-      state.imports.foreach(i => out.println(SyntaxHighlighting.highlight(i.show))
+      state.imports.foreach(i => out.println(SyntaxHighlighting.highlight(i.show)))
       state
 
     case Load(path) =>
@@ -337,7 +337,7 @@ class ReplDriver(settings: Array[String],
     case TypeOf(expr) =>
       compiler.typeOf(expr)(newRun(state)).fold(
         displayErrors,
-        res => out.println(SyntaxHighlighting.highlight(res)(state.run.runContext))
+        res => out.println(SyntaxHighlighting.highlight(res)(state.context))
       )
       state