Uniformly route reporting through reporter.

Sharpen interfaces, reduce footprint of Reporting trait.
Ideally, all reporting should indirect through reporter,
and the `Reporting` trait itself should be restricted to
a single method that retrieves the current `reporter`.

Pull up some more reporting to reflect.internal.
Would like to do more, but need to move partest to the
reflect.internal interface first.
(Its `errorCount` relies on `ERROR.count` in `tools.nsc.Reporter`.)

1 files changed, 6 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
index 16d432438a..6c592ead0d 100644
--- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
@@ -62,12 +62,13 @@ abstract class AbstractReporter extends Reporter {
    */
   private def testAndLog(pos: Position, severity: Severity, msg: String): Boolean =
     pos != null && pos.isDefined && {
-      val fpos = pos.focus
+      val fpos     = pos.focus
       val suppress = positions(fpos) match {
-        case ERROR                         => true  // already error at position
-        case highest if highest > severity => true  // already message higher than present severity
-        case `severity`                    => messages(fpos) contains msg // already issued this exact message
-        case _                             => false // good to go
+        case ERROR                    => true  // already error at position
+        case highest
+          if highest.id > severity.id => true  // already message higher than present severity
+        case `severity`               => messages(fpos) contains msg // already issued this exact message
+        case _                        => false // good to go
       }
 
       suppress || {