Clean up in ConsoleReporter & MessageRendering

Author: felixmulder

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

@@ -2,11 +2,10 @@ package dotty.tools
 package dotc
 package reporting
 
-import util.SourcePosition
 import core.Contexts._
 import java.io.{ BufferedReader, PrintWriter }
 import diagnostic.{ Message, MessageContainer }
-import diagnostic.messages._
+import diagnostic.messages.{ Error, Warning, ConditionalWarning }
 
 /**
   * This class implements a Reporter that displays messages on a text console
@@ -25,48 +24,40 @@ class ConsoleReporter(
   def printMessage(msg: String): Unit = { writer.print(msg + "\n"); writer.flush() }
 
   /** Prints the message with the given position indication. */
-  def printMessageAndPos(msg: Message, pos: SourcePosition, diagnosticLevel: String)(implicit ctx: Context): Boolean = {
-    printMessage(messageAndPos(msg, pos, diagnosticLevel))
-    true
-  }
-
-  def printExplanation(m: Message)(implicit ctx: Context): Unit = {
-    printMessage(explanation(m))
-  }
-
-  override def doReport(m: MessageContainer)(implicit ctx: Context): Unit = {
+  def doReport(m: MessageContainer)(implicit ctx: Context): Unit = {
     val didPrint = m match {
       case m: Error =>
-        val didPrint = printMessageAndPos(m.contained, m.pos, diagnosticLevel(m))
+        printMessage(messageAndPos(m.contained, m.pos, diagnosticLevel(m)))
         if (ctx.settings.prompt.value) displayPrompt()
-        didPrint
+        true
       case m: ConditionalWarning if !m.enablingOption.value =>
         false
       case m =>
-        printMessageAndPos(m.contained, m.pos, diagnosticLevel(m))
+        printMessage(messageAndPos(m.contained, m.pos, diagnosticLevel(m)))
+        true
     }
 
     if (didPrint && ctx.shouldExplain(m))
-      printExplanation(m.contained)
+      printMessage(explanation(m.contained))
     else if (didPrint && m.contained.explanation.nonEmpty)
       printMessage("\nlonger explanation available when compiling with `-explain`")
   }
 
-  def displayPrompt(): Unit = {
-    writer.print("\na)bort, s)tack, r)esume: ")
-    writer.flush()
+  /** Show prompt if `-Xprompt` is passed as a flag to the compiler */
+  def displayPrompt()(implicit ctx: Context): Unit = {
+    printMessage("\na)bort, s)tack, r)esume: ")
+    flush()
     if (reader != null) {
       val response = reader.read().asInstanceOf[Char].toLower
       if (response == 'a' || response == 's') {
         Thread.dumpStack()
         if (response == 'a')
           sys.exit(1)
       }
-      writer.print("\n")
-      writer.flush()
+      print("\n")
+      flush()
     }
   }
 
   override def flush()(implicit ctx: Context): Unit = { writer.flush() }
 }
-

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

@@ -54,15 +54,16 @@ trait MessageRendering {
   def errorMsg(pos: SourcePosition, msg: String, offset: Int)(implicit ctx: Context): String = {
     val leastWhitespace = msg.lines.foldLeft(Int.MaxValue) { (minPad, line) =>
       val lineLength = stripColor(line).length
-      val padding =
-        math.min(math.max(0, ctx.settings.pageWidth.value - offset - lineLength), offset + pos.startColumn)
+      val currPad = math.min(
+        math.max(0, ctx.settings.pageWidth.value - offset - lineLength),
+        offset + pos.startColumn
+      )
 
-      if (padding < minPad) padding
-      else minPad
+      math.min(currPad, minPad)
     }
 
     msg.lines
-      .map { line => " " * (offset - 1) + "|" + (" " * (leastWhitespace - offset)) + line }
+      .map { line => " " * (offset - 1) + "|" + (" " * (leastWhitespace - offset)) + line}
       .mkString(sys.props("line.separator"))
   }
 
@@ -83,9 +84,11 @@ trait MessageRendering {
     }).show else ""
 
   def explanation(m: Message)(implicit ctx: Context): String = {
-    val sb = new StringBuilder(hl"""|
-                                    |${Blue("Explanation")}
-                                    |${Blue("===========")}""".stripMargin)
+    val sb = new StringBuilder(
+      hl"""|
+           |${Blue("Explanation")}
+           |${Blue("===========")}"""
+    )
     sb.append('\n').append(m.explanation)
     if (m.explanation.lastOption != Some('\n')) sb.append('\n')
     sb.toString
@@ -103,7 +106,7 @@ trait MessageRendering {
     sb.toString
   }
 
-  def diagnosticLevel(cont: MessageContainer): String = {
+  def diagnosticLevel(cont: MessageContainer): String =
     cont match {
       case m: Error => "Error"
       case m: FeatureWarning => "Feature Warning"
@@ -113,5 +116,4 @@ trait MessageRendering {
       case m: Warning => "Warning"
       case m: Info => "Info"
     }
-  }
 }