Make relevant parts of compiler conform to new error handling

1 files changed, 25 insertions, 34 deletions

diff --git a/src/dotty/tools/dotc/reporting/Reporter.scala b/src/dotty/tools/dotc/reporting/Reporter.scala
index 538464daa..b969fa878 100644
--- a/src/dotty/tools/dotc/reporting/Reporter.scala
+++ b/src/dotty/tools/dotc/reporting/Reporter.scala
@@ -12,13 +12,13 @@ import core.Mode
 import dotty.tools.dotc.core.Symbols.Symbol
 import diagnostic.messages._
 import diagnostic._
-import MessageCreator._
+import Message._
 
 object Reporter {
   /** Convert a SimpleReporter into a real Reporter */
   def fromSimpleReporter(simple: interfaces.SimpleReporter): Reporter =
     new Reporter with UniqueMessagePositions with HideNonSensicalMessages {
-      override def doReport(m: Message)(implicit ctx: Context): Unit = m match {
+      override def doReport(m: MessageContainer)(implicit ctx: Context): Unit = m match {
         case m: ConditionalWarning if !m.enablingOption.value =>
         case _ =>
           simple.report(m)
@@ -37,17 +37,17 @@ trait Reporting { this: Context =>
   def echo(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
     reporter.report(new Info(msg, pos, "Info"))
 
-  def deprecationWarning(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
-    reporter.report(new DeprecationWarning(msg, pos, "Deprecation Warning"))
+  def deprecationWarning(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
+    reporter.report(msg.deprecationWarning(pos))
 
-  def migrationWarning(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
-    reporter.report(new MigrationWarning(msg, pos, "Migration Warning"))
+  def migrationWarning(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
+    reporter.report(msg.migrationWarning(pos))
 
-  def uncheckedWarning(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
-    reporter.report(new UncheckedWarning(msg, pos, "Unchecked Warning"))
+  def uncheckedWarning(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
+    reporter.report(msg.uncheckedWarning(pos))
 
-  def featureWarning(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
-    reporter.report(new FeatureWarning(msg, pos, "Feature Warning"))
+  def featureWarning(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
+    reporter.report(msg.featureWarning(pos))
 
   def featureWarning(feature: String, featureDescription: String, isScala2Feature: Boolean,
       featureUseSite: Symbol, required: Boolean, pos: SourcePosition): Unit = {
@@ -72,32 +72,24 @@ trait Reporting { this: Context =>
     else reporter.report(new FeatureWarning(msg, pos))
   }
 
-  def warning(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
-    reporter.report(new Warning(msg, pos))
-
-  def explainWarning(msg: => MessageCreator, pos: SourcePosition = NoSourcePosition): Unit =
+  def warning(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
     reporter.report(msg.warning(pos))
 
-  def strictWarning(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
+  def strictWarning(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
     if (this.settings.strict.value) error(msg, pos)
-    else warning(msg + "\n(This would be an error under strict mode)", pos)
-
-  def error(msg: => String, pos: SourcePosition = NoSourcePosition): Unit = {
-    // println("*** ERROR: " + msg) // !!! DEBUG
-    reporter.report(new Error(msg, pos))
-  }
+    else warning(msg.mapMsg(_ + "\n(This would be an error under strict mode)"), pos)
 
-  def explainError(msg: => MessageCreator, pos: SourcePosition = NoSourcePosition): Unit =
+  def error(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
     reporter.report(msg.error(pos))
 
-  def errorOrMigrationWarning(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
+  def errorOrMigrationWarning(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
     if (ctx.scala2Mode) migrationWarning(msg, pos) else error(msg, pos)
 
-  def restrictionError(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
-    error(s"Implementation restriction: $msg", pos)
+  def restrictionError(msg: => Message, pos: SourcePosition = NoSourcePosition): Unit =
+    error(msg.mapMsg(m => s"Implementation restriction: $m"), pos)
 
-  def incompleteInputError(msg: String, pos: SourcePosition = NoSourcePosition)(implicit ctx: Context): Unit =
-    reporter.incomplete(new Error(msg, pos))(ctx)
+  def incompleteInputError(msg: Message, pos: SourcePosition = NoSourcePosition)(implicit ctx: Context): Unit =
+    reporter.incomplete(msg.error(pos))(ctx)
 
   /** Log msg if settings.log contains the current phase.
    *  See [[config.CompilerCommand#explainAdvanced]] for the exact meaning of
@@ -184,7 +176,7 @@ trait Reporting { this: Context =>
 abstract class Reporter extends interfaces.ReporterResult {
 
   /** Report a diagnostic */
-  def doReport(d: Message)(implicit ctx: Context): Unit
+  def doReport(d: MessageContainer)(implicit ctx: Context): Unit
 
   /** Whether very long lines can be truncated.  This exists so important
    *  debugging information (like printing the classpath) is not rendered
@@ -199,7 +191,7 @@ abstract class Reporter extends interfaces.ReporterResult {
     finally _truncationOK = saved
   }
 
-  type ErrorHandler = Message => Context => Unit
+  type ErrorHandler = MessageContainer => Context => Unit
   private var incompleteHandler: ErrorHandler = d => c => report(d)(c)
   def withIncompleteHandler[T](handler: ErrorHandler)(op: => T): T = {
     val saved = incompleteHandler
@@ -228,7 +220,7 @@ abstract class Reporter extends interfaces.ReporterResult {
     override def default(key: String) = 0
   }
 
-  def report(d: Message)(implicit ctx: Context): Unit =
+  def report(d: MessageContainer)(implicit ctx: Context): Unit =
     if (!isHidden(d)) {
       doReport(d)(ctx.addMode(Mode.Printing))
       d match {
@@ -242,12 +234,11 @@ abstract class Reporter extends interfaces.ReporterResult {
       }
     }
 
-  def incomplete(d: Message)(implicit ctx: Context): Unit =
+  def incomplete(d: MessageContainer)(implicit ctx: Context): Unit =
     incompleteHandler(d)(ctx)
 
-
   /** Summary of warnings and errors */
-  def summary/*(implicit ctx: Context)*/: String = {
+  def summary: String = {
     val b = new mutable.ListBuffer[String]
     if (warningCount > 0)
       b += countString(warningCount, "warning") + " found"
@@ -275,7 +266,7 @@ abstract class Reporter extends interfaces.ReporterResult {
   }
 
   /** Should this diagnostic not be reported at all? */
-  def isHidden(m: Message)(implicit ctx: Context): Boolean = ctx.mode.is(Mode.Printing)
+  def isHidden(m: MessageContainer)(implicit ctx: Context): Boolean = ctx.mode.is(Mode.Printing)
 
   /** Does this reporter contain not yet reported errors or warnings? */
   def hasPending: Boolean = false