[analyzer] Convert a few errors to literate diagnostic reporting.

This change modifies the following four errors to use the analyzer's
new literate diagnostic reporting API:

- `CompileTimeErrorCode.abstractFieldConstructorInitializer`
- `CompileTimeErrorCode.abstractSuperMemberReference`
- `CompileTimeErrorCode.baseClassImplementedOutsideOfLibrary`
- `CompileTimeErrorCode.baseMixinImplementedOutsideOfLibrary`

Also, the parameter names used by these messages are changed from the
old placeholder names (`p0`, `p1`, etc.) to names that appropriately
discribe their functions.

This should be enough to validate the overall approach. After this, I
will move over to the CFE side, to give its `withArguments` methods
the ability to accept named parameters rather than positional ones.

Change-Id: I6a6a6964fca29633c18dc7945cdd7def0bbabdf3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447060
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: stereotype441

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

@@ -7,7 +7,6 @@ import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:analyzer/dart/ast/token.dart' show Token;
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -18,6 +17,7 @@ import 'package:analyzer/src/dart/resolver/extension_member_resolver.dart';
 import 'package:analyzer/src/dart/resolver/invocation_inference_helper.dart';
 import 'package:analyzer/src/dart/resolver/invocation_inferrer.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/error/listener.dart';
 import 'package:analyzer/src/generated/inference_log.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/scope_helpers.dart';
@@ -1024,10 +1024,10 @@ class MethodInvocationResolver with ScopeHelpers {
         contextType: contextType,
       );
 
-      _resolver.diagnosticReporter.atNode(
-        nameNode,
-        CompileTimeErrorCode.abstractSuperMemberReference,
-        arguments: [target.kind.displayName, name],
+      _resolver.diagnosticReporter.report(
+        CompileTimeErrorCode.abstractSuperMemberReference
+            .withArguments(kind: target.kind.displayName, name: name)
+            .at(nameNode),
       );
       return null;
     }

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

@@ -7,7 +7,6 @@ import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/error/error.dart';
-import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -21,6 +20,7 @@ import 'package:analyzer/src/dart/resolver/lexical_lookup.dart';
 import 'package:analyzer/src/dart/resolver/resolution_result.dart';
 import 'package:analyzer/src/error/assignment_verifier.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/error/listener.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/scope_helpers.dart';
 import 'package:analyzer/src/generated/super_context.dart';
@@ -942,10 +942,13 @@ class PropertyElementResolver with ScopeHelpers {
             name,
           );
           if (readElement != null) {
-            diagnosticReporter.atNode(
-              propertyName,
-              CompileTimeErrorCode.abstractSuperMemberReference,
-              arguments: [readElement.kind.displayName, propertyName.name],
+            diagnosticReporter.report(
+              CompileTimeErrorCode.abstractSuperMemberReference
+                  .withArguments(
+                    kind: readElement.kind.displayName,
+                    name: propertyName.name,
+                  )
+                  .at(propertyName),
             );
           } else {
             diagnosticReporter.atNode(
@@ -990,10 +993,13 @@ class PropertyElementResolver with ScopeHelpers {
             inherited: true,
           );
           if (writeElement != null) {
-            diagnosticReporter.atNode(
-              propertyName,
-              CompileTimeErrorCode.abstractSuperMemberReference,
-              arguments: [writeElement.kind.displayName, propertyName.name],
+            diagnosticReporter.report(
+              CompileTimeErrorCode.abstractSuperMemberReference
+                  .withArguments(
+                    kind: writeElement.kind.displayName,
+                    name: propertyName.name,
+                  )
+                  .at(propertyName),
             );
           } else {
             diagnosticReporter.atNode(

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

@@ -7,10 +7,10 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
-import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/error/listener.dart';
 
 /// Helper for verifying that subelements of a base or final element must be
 /// base, final, or sealed.
@@ -243,11 +243,13 @@ class BaseOrFinalTypeVerifier {
         var errorCode = baseOrFinalSuperElement is MixinElement
             ? CompileTimeErrorCode.baseMixinImplementedOutsideOfLibrary
             : CompileTimeErrorCode.baseClassImplementedOutsideOfLibrary;
-        _diagnosticReporter.atNode(
-          implementsNamedType,
-          errorCode,
-          arguments: [baseOrFinalSuperElement.displayName],
-          contextMessages: contextMessages,
+        _diagnosticReporter.report(
+          errorCode
+              .withArguments(
+                superElementName: baseOrFinalSuperElement.displayName,
+              )
+              .withContextMessages(contextMessages)
+              .at(implementsNamedType),
         );
         return true;
       }

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

@@ -42,10 +42,10 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
       );
 
   /// Parameters:
-  /// String p0: the display name for the kind of the found abstract member
-  /// String p1: the name of the member
+  /// String kind: 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 p0, required String p1})
+    LocatableDiagnostic Function({required String kind, required String name})
   >
   abstractSuperMemberReference = CompileTimeErrorTemplate(
     'ABSTRACT_SUPER_MEMBER_REFERENCE',
@@ -470,9 +470,9 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
   );
 
   /// Parameters:
-  /// String p0: the name of the base class being implemented
+  /// String superElementName: the name of the base class being implemented
   static const CompileTimeErrorTemplate<
-    LocatableDiagnostic Function({required String p0})
+    LocatableDiagnostic Function({required String superElementName})
   >
   baseClassImplementedOutsideOfLibrary = CompileTimeErrorTemplate(
     'INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY',
@@ -485,9 +485,9 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
   );
 
   /// Parameters:
-  /// String p0: the name of the base mixin being implemented
+  /// String superElementName: the name of the base mixin being implemented
   static const CompileTimeErrorTemplate<
-    LocatableDiagnostic Function({required String p0})
+    LocatableDiagnostic Function({required String superElementName})
   >
   baseMixinImplementedOutsideOfLibrary = CompileTimeErrorTemplate(
     'INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY',
@@ -8065,10 +8065,10 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
   DiagnosticType get type => DiagnosticType.COMPILE_TIME_ERROR;
 
   static LocatableDiagnostic _withArgumentsAbstractSuperMemberReference({
-    required String p0,
-    required String p1,
+    required String kind,
+    required String name,
   }) {
-    return LocatableDiagnosticImpl(abstractSuperMemberReference, [p0, p1]);
+    return LocatableDiagnosticImpl(abstractSuperMemberReference, [kind, name]);
   }
 
   static LocatableDiagnostic _withArgumentsAmbiguousExport({
@@ -8166,13 +8166,21 @@ class CompileTimeErrorCode extends DiagnosticCodeWithExpectedTypes {
   }
 
   static LocatableDiagnostic
-  _withArgumentsBaseClassImplementedOutsideOfLibrary({required String p0}) {
-    return LocatableDiagnosticImpl(baseClassImplementedOutsideOfLibrary, [p0]);
+  _withArgumentsBaseClassImplementedOutsideOfLibrary({
+    required String superElementName,
+  }) {
+    return LocatableDiagnosticImpl(baseClassImplementedOutsideOfLibrary, [
+      superElementName,
+    ]);
   }
 
   static LocatableDiagnostic
-  _withArgumentsBaseMixinImplementedOutsideOfLibrary({required String p0}) {
-    return LocatableDiagnosticImpl(baseMixinImplementedOutsideOfLibrary, [p0]);
+  _withArgumentsBaseMixinImplementedOutsideOfLibrary({
+    required String superElementName,
+  }) {
+    return LocatableDiagnosticImpl(baseMixinImplementedOutsideOfLibrary, [
+      superElementName,
+    ]);
   }
 
   static LocatableDiagnostic _withArgumentsBodyMightCompleteNormally({

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

@@ -16,7 +16,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
-import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/analysis/analysis_options.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
@@ -40,6 +39,7 @@ import 'package:analyzer/src/error/constructor_fields_verifier.dart';
 import 'package:analyzer/src/error/correct_override.dart';
 import 'package:analyzer/src/error/duplicate_definition_verifier.dart';
 import 'package:analyzer/src/error/getter_setter_types_verifier.dart';
+import 'package:analyzer/src/error/listener.dart';
 import 'package:analyzer/src/error/literal_element_verifier.dart';
 import 'package:analyzer/src/error/required_parameters_verifier.dart';
 import 'package:analyzer/src/error/return_type_verifier.dart';
@@ -1766,9 +1766,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     FieldElement fieldElement,
   ) {
     if (fieldElement.isAbstract) {
-      diagnosticReporter.atToken(
-        identifier,
-        CompileTimeErrorCode.abstractFieldConstructorInitializer,
+      diagnosticReporter.report(
+        CompileTimeErrorCode.abstractFieldConstructorInitializer.at(identifier),
       );
     }
     if (fieldElement.isExternal) {
@@ -2151,16 +2150,16 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
             // to avoid double errors if implementing `int`.
             if (interfaceElement is ClassElementImpl &&
                 !interfaceElement.isSealed) {
-              diagnosticReporter.atNode(
-                interface,
-                CompileTimeErrorCode.baseClassImplementedOutsideOfLibrary,
-                arguments: [interfaceElement.name!],
+              diagnosticReporter.report(
+                CompileTimeErrorCode.baseClassImplementedOutsideOfLibrary
+                    .withArguments(superElementName: interfaceElement.name!)
+                    .at(interface),
               );
             } else if (interfaceElement is MixinElement) {
-              diagnosticReporter.atNode(
-                interface,
-                CompileTimeErrorCode.baseMixinImplementedOutsideOfLibrary,
-                arguments: [interfaceElement.name!],
+              diagnosticReporter.report(
+                CompileTimeErrorCode.baseMixinImplementedOutsideOfLibrary
+                    .withArguments(superElementName: interfaceElement.name!)
+                    .at(interface),
               );
             }
             break;

pkg/analyzer/messages.yaml

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