reduce duplicate error by position to pass ErrorMessagesTests.anonymousFunctionMissingParamType

Author: liufengyun

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -23,7 +23,7 @@ import Implicits.ContextualImplicits
 import config.Settings._
 import config.Config
 import reporting._
-import reporting.diagnostic.Message
+import reporting.diagnostic.messages.Error
 import collection.mutable
 import collection.immutable.BitSet
 import printing._
@@ -636,7 +636,7 @@ object Contexts {
      *  instead of storing message computations directly in ErrorTypes in order
      *  to avoid space leaks - the message computation usually captures a context.
      */
-    private[core] val errorTypeMsg = mutable.Map[ErrorType, () => Message]()
+    private[core] val errorTypeError = mutable.Map[ErrorType, () => Error]()
 
     // Phases state
 
@@ -664,7 +664,7 @@ object Contexts {
 
     def reset() = {
       for ((_, set) <- uniqueSets) set.clear()
-      errorTypeMsg.clear()
+      errorTypeError.clear()
     }
 
     // Test that access is single threaded

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -25,7 +25,7 @@ import ast.tpd
 import tpd.Tree
 import ast.TreeTypeMap
 import Constants.Constant
-import reporting.diagnostic.Message
+import reporting.diagnostic.messages.Error
 import Denotations.{ Denotation, SingleDenotation, MultiDenotation }
 import collection.mutable
 import io.AbstractFile
@@ -301,8 +301,8 @@ trait Symbols { this: Context =>
    */
   def newSkolem(tp: Type) = newSymbol(defn.RootClass, nme.SKOLEM, SyntheticArtifact | Permanent, tp)
 
-  def newErrorSymbol(owner: Symbol, name: Name, msg: => Message) = {
-    val errType = ErrorType(msg)
+  def newErrorSymbol(owner: Symbol, name: Name, err: => Error) = {
+    val errType = ErrorType(err)
     newSymbol(owner, name, SyntheticArtifact,
         if (name.isTypeName) TypeAlias(errType) else errType)
   }

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -21,6 +21,7 @@ import util.Positions.{Position, NoPosition}
 import util.Stats._
 import util.{DotClass, SimpleMap}
 import reporting.diagnostic.Message
+import reporting.diagnostic.messages.Error
 import reporting.diagnostic.messages.CyclicReferenceInvolving
 import ast.tpd._
 import ast.TreeTypeMap
@@ -453,7 +454,7 @@ object Types {
       case tp: TypeProxy =>
         tp.underlying.findDecl(name, excluded)
       case err: ErrorType =>
-        ctx.newErrorSymbol(classSymbol orElse defn.RootClass, name, err.msg)
+        ctx.newErrorSymbol(classSymbol orElse defn.RootClass, name, err.error)
       case _ =>
         NoDenotation
     }
@@ -519,7 +520,7 @@ object Types {
         case tp: JavaArrayType =>
           defn.ObjectType.findMember(name, pre, excluded)
         case err: ErrorType =>
-          ctx.newErrorSymbol(pre.classSymbol orElse defn.RootClass, name, err.msg)
+          ctx.newErrorSymbol(pre.classSymbol orElse defn.RootClass, name, err.error)
         case _ =>
           NoDenotation
       }
@@ -1762,7 +1763,7 @@ object Types {
       else { // name has changed; try load in earlier phase and make current
         val d = loadDenot(ctx.withPhase(ctx.phaseId - 1)).current
         if (d.exists) d
-        else throw new Error(s"failure to reload $this of class $getClass")
+        else throw new scala.Error(s"failure to reload $this of class $getClass")
       }
     }
 
@@ -3633,22 +3634,24 @@ object Types {
   abstract class FlexType extends UncachedGroundType with ValueType
 
   class ErrorType private[Types] () extends FlexType {
-    def msg(implicit ctx: Context): Message =
-      ctx.errorTypeMsg.get(this) match {
-        case Some(msgFun) => msgFun()
-        case None => "error message from previous run no longer available"
+    def error(implicit ctx: Context): Error =
+      ctx.errorTypeError.get(this) match {
+        case Some(errFun) => errFun()
+        case None => new Error("error message from previous run no longer available", NoPosition)
       }
   }
   object ErrorType {
-    def apply(msg: => Message)(implicit ctx: Context): ErrorType = {
+    def apply(msg: => Message)(implicit ctx: Context): ErrorType = apply(new Error(msg, NoPosition))
+
+    def apply(err: Error)(implicit ctx: Context): ErrorType = {
       val et = new ErrorType
-      ctx.base.errorTypeMsg(et) = () => msg
+      ctx.base.errorTypeError(et) = () => err
       et
     }
   }
 
   object UnspecifiedErrorType extends ErrorType() {
-    override def msg(implicit ctx: Context): Message = "unspecified error"
+    override def error(implicit ctx: Context): Error = new Error("unspecified error", NoPosition)
   }
 
   /* Type used to track Select nodes that could not resolve a member and their qualifier is a scala.Dynamic. */

compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala

@@ -23,7 +23,7 @@ object ErrorReporting {
 
   def errorType(msg: => Message, pos: Position)(implicit ctx: Context): ErrorType = {
     ctx.error(msg, pos)
-    ErrorType(msg)
+    ErrorType(new Error(msg, pos))
   }
 
   def cyclicErrorMsg(ex: CyclicReference)(implicit ctx: Context) = {

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -2251,7 +2251,10 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
      *  tree that went unreported. A scenario where this happens is i1802.scala.
      */
     def ensureReported(tp: Type) = tp match {
-      case err: ErrorType if !ctx.reporter.hasErrors => ctx.error(err.msg, tree.pos)
+      case err: ErrorType
+      if !ctx.reporter.hasErrors &&
+        (!err.error.pos.exists || err.error.pos == ctx.source.atPos(tree.pos)) =>
+          ctx.error(err.error.message, tree.pos)
       case _ =>
     }
 

compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTests.scala

@@ -56,7 +56,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val OverridesNothing(member) :: Nil = messages
@@ -78,7 +77,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val OverridesNothingButNameExists(member, sameName) :: Nil = messages
@@ -103,7 +101,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val ForwardReferenceExtendsOverDefinition(value, definition) :: Nil = messages
@@ -121,7 +118,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val ExpectedTokenButFound(expected, found) :: Nil = messages
@@ -153,7 +149,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val MixedLeftAndRightAssociativeOps(op1, op2, op2LeftAssoc) :: Nil = messages
@@ -173,7 +168,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val CantInstantiateAbstractClassOrTrait(cls, isTrait) :: Nil = messages
@@ -192,7 +186,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val CantInstantiateAbstractClassOrTrait(cls, isTrait) :: Nil = messages
@@ -211,7 +204,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val OverloadedOrRecursiveMethodNeedsResultType(treeName) :: Nil = messages
@@ -243,7 +235,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val OverloadedOrRecursiveMethodNeedsResultType(treeName) :: Nil = messages
@@ -260,7 +251,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val RecursiveValueNeedsResultType(tree) :: Nil = messages
@@ -278,7 +268,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val CyclicReferenceInvolving(denot) :: Nil = messages
@@ -299,7 +288,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val CyclicReferenceInvolvingImplicit(tree) :: Nil = messages
@@ -323,7 +311,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val SuperQualMustBeParent(qual, cls) :: Nil = messages
@@ -351,7 +338,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       import typer.Typer.BindingPrec._
 
@@ -373,7 +359,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val MethodDoesNotTakeParameters(tree, methodPart) :: Nil = messages
@@ -393,7 +378,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val MethodDoesNotTakeParameters(tree, methodPart) :: Nil = messages
@@ -418,7 +402,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val AmbiguousOverload(tree, List(alt1, alt2), pt: WildcardType) :: Nil = messages
@@ -452,7 +435,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val TypeDoesNotTakeParameters(tpe, params) :: Nil = messages
@@ -468,7 +450,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val ParameterizedTypeLacksArguments(symbol) :: Nil = messages
@@ -824,11 +805,12 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     checkMessagesAfter("refchecks") {
       """
         |object AnonymousF {
-        |  val f = { case l@List(1,2,3) => Some(l); case _ => None }
+        |  val f = { case l@List(1,2,3) => Some(l); }
         |}""".stripMargin
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
+
       assertMessageCount(1, messages)
       val AnonymousFunctionMissingParamType(param, args, _, pt) :: Nil = messages
       assertEquals("x$1", param.show)
@@ -884,7 +866,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val err :: Nil = messages
@@ -901,7 +882,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(2, messages)
       messages.foreach(assertEquals(_, ImplicitFunctionTypeNeedsNonEmptyParameterList()))
@@ -916,7 +896,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
-      val defn = ictx.definitions
 
       assertMessageCount(1, messages)
       val err :: Nil = messages
@@ -932,7 +911,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
       .expect { (ictx, messages) =>
         implicit val ctx: Context = ictx
-        val defn = ictx.definitions
 
         assertMessageCount(1, messages)
         val err :: Nil = messages
@@ -946,7 +924,6 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     }
       .expect { (ictx, messages) =>
         implicit val ctx: Context = ictx
-        val defn = ictx.definitions
 
         assertMessageCount(1, messages)
         val err :: Nil = messages