Named type error messages to new format

compiler/src/dotty/tools/dotc/reporting/diagnostic/ErrorMessageID.java

@@ -107,7 +107,9 @@ public enum ErrorMessageID {
     TailrecNotApplicableID,
     FailureToEliminateExistentialID,
     OnlyFunctionsCanBeFollowedByUnderscoreID,
-    MissingEmptyArgumentListID
+    MissingEmptyArgumentListID,
+    DuplicateNamedTypeArgumentID,
+    UndefinedNamedTypeArgumentID
     ;
 
     public int errorNumber() {

compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala

@@ -1865,4 +1865,18 @@ object messages {
           |Excluded from this rule are methods that are defined in Java or that override methods defined in Java."""
     }
   }
+
+  case class DuplicateNamedTypeArgument(name: Name)(implicit ctx: Context)
+    extends Message(DuplicateNamedTypeArgumentID) {
+    val kind = "Syntax"
+    val msg = hl"Type parameter $name was defined multiple times."
+    val explanation = ""
+  }
+
+  case class UndefinedNamedTypeArgument(undefinedName: Name, definedNames: List[Name])(implicit ctx: Context)
+    extends Message(UndefinedNamedTypeArgumentID) {
+    val kind = "Syntax"
+    val msg = hl"Type parameter $undefinedName is undefined. Expected one of ${definedNames.mkString(", ")}."
+    val explanation = ""
+  }
 }

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

@@ -371,9 +371,9 @@ trait TypeAssigner {
           val namedArgMap = new mutable.HashMap[Name, Type]
           for (NamedArg(name, arg) <- args)
             if (namedArgMap.contains(name))
-              ctx.error("duplicate name", arg.pos)
+              ctx.error(DuplicateNamedTypeArgument(name), arg.pos)
             else if (!paramNames.contains(name))
-              ctx.error(s"undefined parameter name, required: ${paramNames.mkString(" or ")}", arg.pos)
+              ctx.error(UndefinedNamedTypeArgument(name, paramNames), arg.pos)
             else
               namedArgMap(name) = preCheckKind(arg, paramBoundsByName(name.asTypeName)).tpe
 

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

@@ -1088,4 +1088,47 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       val MissingEmptyArgumentList(method) :: Nil = messages
       assertEquals("method greet", method.show)
     }
+
+  @Test def duplicateNamedTypeArgument =
+    checkMessagesAfter("frontend") {
+      """
+        |object Test {
+        |  def f[A, B]() = ???
+        |  f[A=Any, A=Any]()
+        |  f[B=Any, B=Any]()
+        |}
+        |
+      """.stripMargin
+    }
+    .expect { (ictx, messages) =>
+      implicit val ctx: Context = ictx
+
+      assertMessageCount(2, messages)
+      val DuplicateNamedTypeArgument(n2) :: DuplicateNamedTypeArgument(n1) :: Nil = messages
+      assertEquals("A", n1.show)
+      assertEquals("B", n2.show)
+    }
+
+  @Test def undefinedNamedTypeArgument =
+    checkMessagesAfter("frontend") {
+      """
+        |object Test {
+        |  def f[A, B]() = ???
+        |  f[A=Any, C=Any]()
+        |  f[C=Any, B=Any]()
+        |}
+        |
+      """.stripMargin
+    }
+      .expect { (ictx, messages) =>
+        implicit val ctx: Context = ictx
+
+        assertMessageCount(2, messages)
+        val UndefinedNamedTypeArgument(n2, l2) :: UndefinedNamedTypeArgument(n1, l1) :: Nil = messages
+        assertEquals("C", n1.show)
+        assertEquals("A"::"B"::Nil, l1.map(_.show))
+        assertEquals("C", n2.show)
+        assertEquals("A"::"B"::Nil, l2.map(_.show))
+
+      }
 }