Dedupe ConsoleReporter & ReplConsoleReporter

Author: dwijnand

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

@@ -12,27 +12,30 @@ import Diagnostic.{ Error, ConditionalWarning }
 class ConsoleReporter(
   reader: BufferedReader = Console.in,
   writer: PrintWriter = new PrintWriter(Console.err, true)
-) extends AbstractReporter {
+) extends ConsoleReporter.AbstractConsoleReporter {
+  override def printMessage(msg: String): Unit = { writer.print(msg + "\n"); writer.flush() }
+  override def flush()(using Context): Unit    = writer.flush()
 
-  import Diagnostic._
-
-  /** Prints the message. */
-  def printMessage(msg: String): Unit = { writer.print(msg + "\n"); writer.flush() }
-
-  /** Prints the message with the given position indication. */
-  def doReport(dia: Diagnostic)(using Context): Unit = {
+  override def doReport(dia: Diagnostic)(using Context): Unit = {
+    super.doReport(dia)
     dia match
-      case dia: Error =>
-        printMessage(messageAndPos(dia))
-        if (ctx.settings.Xprompt.value) Reporter.displayPrompt(reader, writer)
-      case dia =>
-        printMessage(messageAndPos(dia))
-
-    if shouldExplain(dia) then
-      printMessage(explanation(dia.msg))
-    else if dia.msg.canExplain then
-      printMessage("\nlonger explanation available when compiling with `-explain`")
+      case dia: Error if ctx.settings.Xprompt.value => Reporter.displayPrompt(reader, writer)
+      case _                                        =>
   }
+}
+
+object ConsoleReporter {
+  abstract class AbstractConsoleReporter extends AbstractReporter {
+    /** Prints the message. */
+    def printMessage(msg: String): Unit
 
-  override def flush()(using Context): Unit = { writer.flush() }
+    /** Prints the message with the given position indication. */
+    def doReport(dia: Diagnostic)(using Context): Unit = {
+      printMessage(messageAndPos(dia))
+      if Diagnostic.shouldExplain(dia) then
+        printMessage(explanation(dia.msg))
+      else if dia.msg.canExplain then
+        printMessage("\nlonger explanation available when compiling with `-explain`")
+    }
+  }
 }

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

@@ -20,7 +20,7 @@ import dotty.tools.dotc.core.Symbols.{Symbol, defn}
 import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.interactive.Completion
 import dotty.tools.dotc.printing.SyntaxHighlighting
-import dotty.tools.dotc.reporting.{AbstractReporter, MessageRendering, StoreReporter}
+import dotty.tools.dotc.reporting.{ConsoleReporter, MessageRendering, StoreReporter}
 import dotty.tools.dotc.reporting.{Message, Diagnostic}
 import dotty.tools.dotc.util.Spans.Span
 import dotty.tools.dotc.util.{SourceFile, SourcePosition}
@@ -425,20 +425,12 @@ class ReplDriver(settings: Array[String],
     state
   }
 
-  /** Like ConsoleReporter, but without file paths or real -Xprompt'ing */
-  private object ReplConsoleReporter extends AbstractReporter {
-    def printMessage(msg: String): Unit = out.println(msg)
-
-    def doReport(dia: Diagnostic)(using Context): Unit = {
-      printMessage(messageAndPos(dia))
-
-      if Diagnostic.shouldExplain(dia) then
-        printMessage(explanation(dia.msg))
-      else if dia.msg.canExplain then
-        printMessage("\nlonger explanation available when compiling with `-explain`")
-    }
-
+  /** Like ConsoleReporter, but without file paths, -Xprompt displaying,
+   *  and using a PrintStream rather than a PrintWriter so messages aren't re-encoded. */
+  private object ReplConsoleReporter extends ConsoleReporter.AbstractConsoleReporter {
     override def posFileStr(pos: SourcePosition) = "" // omit file paths
+    override def printMessage(msg: String): Unit = out.println(msg)
+    override def flush()(using Context): Unit    = out.flush()
   }
 
   /** Print warnings & errors using ReplConsoleReporter, and info straight to out */