[analyzer] Improve parameter names for recently converted diagnostics.

This addresses code review feedback from Brian in
https://dart-review.googlesource.com/c/sdk/+/447060.

Change-Id: I6a6a6964eaaccde4e699c0954a751f4fafeb564d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447403
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Paul Berry <[email protected]>

Author: stereotype441

pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart

@@ -1026,7 +1026,7 @@ class MethodInvocationResolver with ScopeHelpers {
 
       _resolver.diagnosticReporter.report(
         CompileTimeErrorCode.abstractSuperMemberReference
-            .withArguments(kind: target.kind.displayName, name: name)
+            .withArguments(memberKind: target.kind.displayName, name: name)
             .at(nameNode),
       );
       return null;

pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart

@@ -945,7 +945,7 @@ class PropertyElementResolver with ScopeHelpers {
             diagnosticReporter.report(
               CompileTimeErrorCode.abstractSuperMemberReference
                   .withArguments(
-                    kind: readElement.kind.displayName,
+                    memberKind: readElement.kind.displayName,
                     name: propertyName.name,
                   )
                   .at(propertyName),
@@ -996,7 +996,7 @@ class PropertyElementResolver with ScopeHelpers {
             diagnosticReporter.report(
               CompileTimeErrorCode.abstractSuperMemberReference
                   .withArguments(
-                    kind: writeElement.kind.displayName,
+                    memberKind: writeElement.kind.displayName,
                     name: propertyName.name,
                   )
                   .at(propertyName),

pkg/analyzer/lib/src/error/base_or_final_type_verifier.dart

@@ -240,16 +240,17 @@ class BaseOrFinalTypeVerifier {
         superElement.isSealed &&
         baseOrFinalSuperElement.library != element.library) {
       if (baseOrFinalSuperElement.isBase) {
-        var errorCode = baseOrFinalSuperElement is MixinElement
+        var error = baseOrFinalSuperElement is MixinElement
             ? CompileTimeErrorCode.baseMixinImplementedOutsideOfLibrary
-            : CompileTimeErrorCode.baseClassImplementedOutsideOfLibrary;
+                  .withArguments(
+                    implementedMixinName: baseOrFinalSuperElement.displayName,
+                  )
+            : CompileTimeErrorCode.baseClassImplementedOutsideOfLibrary
+                  .withArguments(
+                    implementedClassName: baseOrFinalSuperElement.displayName,
+                  );
         _diagnosticReporter.report(
-          errorCode
-              .withArguments(
-                superElementName: baseOrFinalSuperElement.displayName,
-              )
-              .withContextMessages(contextMessages)
-              .at(implementsNamedType),
+          error.withContextMessages(contextMessages).at(implementsNamedType),
         );
         return true;
       }

pkg/analyzer/lib/src/error/codes.g.dart

@@ -42,10 +42,14 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
       );
 
   /// Parameters:
-  /// String kind: the display name for the kind of the found abstract member
+  /// String memberKind: the display name for the kind of the found abstract
+  ///                    member
   /// String name: the name of the member
   static const CompileTimeErrorTemplate<
-    LocatableDiagnostic Function({required String kind, required String name})
+    LocatableDiagnostic Function({
+      required String memberKind,
+      required String name,
+    })
   >
   abstractSuperMemberReference = CompileTimeErrorTemplate(
     'ABSTRACT_SUPER_MEMBER_REFERENCE',
@@ -470,9 +474,9 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
   );
 
   /// Parameters:
-  /// String superElementName: the name of the base class being implemented
+  /// String implementedClassName: the name of the base class being implemented
   static const CompileTimeErrorTemplate<
-    LocatableDiagnostic Function({required String superElementName})
+    LocatableDiagnostic Function({required String implementedClassName})
   >
   baseClassImplementedOutsideOfLibrary = CompileTimeErrorTemplate(
     'INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY',
@@ -485,9 +489,9 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
   );
 
   /// Parameters:
-  /// String superElementName: the name of the base mixin being implemented
+  /// String implementedMixinName: the name of the base mixin being implemented
   static const CompileTimeErrorTemplate<
-    LocatableDiagnostic Function({required String superElementName})
+    LocatableDiagnostic Function({required String implementedMixinName})
   >
   baseMixinImplementedOutsideOfLibrary = CompileTimeErrorTemplate(
     'INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY',
@@ -8065,10 +8069,13 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
   DiagnosticType get type => DiagnosticType.COMPILE_TIME_ERROR;
 
   static LocatableDiagnostic _withArgumentsAbstractSuperMemberReference({
-    required String kind,
+    required String memberKind,
     required String name,
   }) {
-    return LocatableDiagnosticImpl(abstractSuperMemberReference, [kind, name]);
+    return LocatableDiagnosticImpl(abstractSuperMemberReference, [
+      memberKind,
+      name,
+    ]);
   }
 
   static LocatableDiagnostic _withArgumentsAmbiguousExport({
@@ -8167,19 +8174,19 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
 
   static LocatableDiagnostic
   _withArgumentsBaseClassImplementedOutsideOfLibrary({
-    required String superElementName,
+    required String implementedClassName,
   }) {
     return LocatableDiagnosticImpl(baseClassImplementedOutsideOfLibrary, [
-      superElementName,
+      implementedClassName,
     ]);
   }
 
   static LocatableDiagnostic
   _withArgumentsBaseMixinImplementedOutsideOfLibrary({
-    required String superElementName,
+    required String implementedMixinName,
   }) {
     return LocatableDiagnosticImpl(baseMixinImplementedOutsideOfLibrary, [
-      superElementName,
+      implementedMixinName,
     ]);
   }
 

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -2152,13 +2152,13 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
                 !interfaceElement.isSealed) {
               diagnosticReporter.report(
                 CompileTimeErrorCode.baseClassImplementedOutsideOfLibrary
-                    .withArguments(superElementName: interfaceElement.name!)
+                    .withArguments(implementedClassName: interfaceElement.name!)
                     .at(interface),
               );
             } else if (interfaceElement is MixinElement) {
               diagnosticReporter.report(
                 CompileTimeErrorCode.baseMixinImplementedOutsideOfLibrary
-                    .withArguments(superElementName: interfaceElement.name!)
+                    .withArguments(implementedMixinName: interfaceElement.name!)
                     .at(interface),
               );
             }

pkg/analyzer/messages.yaml

@@ -340,9 +340,9 @@ CompileTimeErrorCode:
     hasPublishedDocs: true
   ABSTRACT_SUPER_MEMBER_REFERENCE:
     parameters:
-      String kind: the display name for the kind of the found abstract member
+      String memberKind: the display name for the kind of the found abstract member
       String name: the name of the member
-    problemMessage: "The #kind '#name' is always abstract in the supertype."
+    problemMessage: "The #memberKind '#name' is always abstract in the supertype."
     hasPublishedDocs: true
     documentation: |-
       #### Description
@@ -1331,9 +1331,9 @@ CompileTimeErrorCode:
       ```
   BASE_CLASS_IMPLEMENTED_OUTSIDE_OF_LIBRARY:
     parameters:
-      String superElementName: the name of the base class being implemented
+      String implementedClassName: the name of the base class being implemented
     sharedName: INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
-    problemMessage: "The class '#superElementName' can't be implemented outside of its library because it's a base class."
+    problemMessage: "The class '#implementedClassName' can't be implemented outside of its library because it's a base class."
     hasPublishedDocs: true
     documentation: |-
       #### Description
@@ -1383,9 +1383,9 @@ CompileTimeErrorCode:
       ```
   BASE_MIXIN_IMPLEMENTED_OUTSIDE_OF_LIBRARY:
     parameters:
-      String superElementName: the name of the base mixin being implemented
+      String implementedMixinName: the name of the base mixin being implemented
     sharedName: INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
-    problemMessage: "The mixin '#superElementName' can't be implemented outside of its library because it's a base mixin."
+    problemMessage: "The mixin '#implementedMixinName' can't be implemented outside of its library because it's a base mixin."
     hasPublishedDocs: true
   BODY_MIGHT_COMPLETE_NORMALLY:
     parameters: