analyzer: Use new DiagnosticCode name in some directories - 2

Work towards #60635

Change-Id: I1d36abb9f98ae875697ac54b9e493ffdb8666f75
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/425580
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

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

@@ -85,7 +85,7 @@ class BinaryExpressionResolver {
   }) {
     _resolver.boolExpressionVerifier.checkForNonBoolExpression(
       operand,
-      errorCode: CompileTimeErrorCode.NON_BOOL_OPERAND,
+      diagnosticCode: CompileTimeErrorCode.NON_BOOL_OPERAND,
       arguments: [operator],
       whyNotPromoted: whyNotPromoted,
     );

pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart

@@ -46,7 +46,7 @@ class DiagnosticFactory {
   /// Return a diagnostic indicating that [duplicateElement] reuses a name
   /// already used by [originalElement].
   AnalysisError duplicateDefinition(
-    ErrorCode code,
+    DiagnosticCode code,
     Element duplicateElement,
     Element originalElement,
     List<Object> arguments,
@@ -77,7 +77,7 @@ class DiagnosticFactory {
   /// already used by [originalNode].
   AnalysisError duplicateDefinitionForNodes(
     Source source,
-    ErrorCode code,
+    DiagnosticCode code,
     SyntacticEntity duplicateNode,
     SyntacticEntity originalNode,
     List<Object> arguments,
@@ -314,7 +314,7 @@ class DiagnosticFactory {
   /// [superMember].
   AnalysisError invalidOverride(
     Source source,
-    ErrorCode errorCode,
+    DiagnosticCode code,
     SyntacticEntity errorNode,
     ExecutableElement member,
     ExecutableElement superMember,
@@ -328,7 +328,7 @@ class DiagnosticFactory {
       source: source,
       offset: errorNode.offset,
       length: errorNode.length,
-      errorCode: errorCode,
+      errorCode: code,
       arguments: [
         memberName,
         member.enclosingElement2!.name3,
@@ -342,15 +342,15 @@ class DiagnosticFactory {
         // INVALID_IMPLEMENTATION_OVERRIDE may provide the subclass as superMember
         // if the subclass has an abstract member and the superclass has the
         // concrete).
-        if (errorCode == CompileTimeErrorCode.INVALID_OVERRIDE)
+        if (code == CompileTimeErrorCode.INVALID_OVERRIDE)
           DiagnosticMessageImpl(
             filePath: superFragment.libraryFragment!.source.fullName,
             message: "The member being overridden.",
             offset: superFragment.nameOffset2 ?? -1,
             length: superFragment.name2!.length,
             url: null,
           ),
-        if (errorCode == CompileTimeErrorCode.INVALID_OVERRIDE_SETTER)
+        if (code == CompileTimeErrorCode.INVALID_OVERRIDE_SETTER)
           DiagnosticMessageImpl(
             filePath: superFragment.libraryFragment!.source.fullName,
             message: "The setter being overridden.",

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

@@ -1087,23 +1087,23 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
 
   void _checkForInvariantNanComparison(BinaryExpression node) {
     void reportStartEnd(
-      ErrorCode errorCode,
+      DiagnosticCode diagnosticCode,
       SyntacticEntity startEntity,
       SyntacticEntity endEntity,
     ) {
       var offset = startEntity.offset;
       _errorReporter.atOffset(
         offset: offset,
         length: endEntity.end - offset,
-        errorCode: errorCode,
+        errorCode: diagnosticCode,
       );
     }
 
-    void checkLeftRight(ErrorCode errorCode) {
+    void checkLeftRight(DiagnosticCode diagnosticCode) {
       if (node.leftOperand.isDoubleNan) {
-        reportStartEnd(errorCode, node.leftOperand, node.operator);
+        reportStartEnd(diagnosticCode, node.leftOperand, node.operator);
       } else if (node.rightOperand.isDoubleNan) {
-        reportStartEnd(errorCode, node.operator, node.rightOperand);
+        reportStartEnd(diagnosticCode, node.operator, node.rightOperand);
       }
     }
 

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

@@ -40,16 +40,17 @@ class BoolExpressionVerifier {
   }) {
     checkForNonBoolExpression(
       condition,
-      errorCode: CompileTimeErrorCode.NON_BOOL_CONDITION,
+      diagnosticCode: CompileTimeErrorCode.NON_BOOL_CONDITION,
       whyNotPromoted: whyNotPromoted,
     );
   }
 
   /// Verify that the given [expression] is of type 'bool', and report
-  /// [errorCode] if not, or a nullability error if its improperly nullable.
+  /// [diagnosticCode] if not, or a nullability error if its improperly
+  /// nullable.
   void checkForNonBoolExpression(
     Expression expression, {
-    required ErrorCode errorCode,
+    required DiagnosticCode diagnosticCode,
     List<Object> arguments = const [],
     required Map<SharedTypeView, NonPromotionReason> Function()? whyNotPromoted,
   }) {
@@ -71,7 +72,7 @@ class BoolExpressionVerifier {
           ),
         );
       } else {
-        _errorReporter.atNode(expression, errorCode, arguments: arguments);
+        _errorReporter.atNode(expression, diagnosticCode, arguments: arguments);
       }
     }
   }
@@ -83,7 +84,7 @@ class BoolExpressionVerifier {
   }) {
     checkForNonBoolExpression(
       expression,
-      errorCode: CompileTimeErrorCode.NON_BOOL_NEGATION_EXPRESSION,
+      diagnosticCode: CompileTimeErrorCode.NON_BOOL_NEGATION_EXPRESSION,
       whyNotPromoted: whyNotPromoted,
     );
   }

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

@@ -45,7 +45,7 @@ class CorrectOverrideHelper {
     required ExecutableElement2OrMember superMember,
     required ErrorReporter errorReporter,
     required SyntacticEntity errorNode,
-    required ErrorCode errorCode,
+    required DiagnosticCode diagnosticCode,
   }) {
     var isCorrect = isCorrectOverrideOf(superMember: superMember);
     if (!isCorrect) {
@@ -55,7 +55,7 @@ class CorrectOverrideHelper {
         errorReporter.reportError(
           _diagnosticFactory.invalidOverride(
             errorReporter.source,
-            errorCode,
+            diagnosticCode,
             errorNode,
             _thisMember,
             superMember,

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

@@ -17,14 +17,6 @@ import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart';
 import 'package:analyzer/src/error/codes.dart';
 
-typedef _CatchClausesVerifierReporter =
-    void Function(
-      CatchClause first,
-      CatchClause last,
-      ErrorCode,
-      List<Object> arguments,
-    );
-
 /// State information captured by [NullSafetyDeadCodeVerifier.for_conditionEnd]
 /// for later use by [NullSafetyDeadCodeVerifier.for_updaterBegin].
 class DeadCodeForPartsState {
@@ -150,7 +142,7 @@ class DeadCodeVerifier extends RecursiveAstVisitor<void> {
       library,
     );
     NodeList<SimpleIdentifier> names;
-    ErrorCode warningCode;
+    DiagnosticCode warningCode;
     if (combinator is HideCombinator) {
       names = combinator.hiddenNames;
       warningCode = WarningCode.UNDEFINED_HIDDEN_NAME;
@@ -525,15 +517,21 @@ class _BreakDoStatementVisitor extends RecursiveAstVisitor<void> {
 
 class _CatchClausesVerifier {
   final TypeSystemImpl _typeSystem;
-  final _CatchClausesVerifierReporter _errorReporter;
+  final void Function(
+    CatchClause first,
+    CatchClause last,
+    DiagnosticCode,
+    List<Object> arguments,
+  )
+  _reportDiagnostic;
   final List<CatchClause> catchClauses;
 
   bool _done = false;
   final List<TypeImpl> _visitedTypes = [];
 
   _CatchClausesVerifier(
     this._typeSystem,
-    this._errorReporter,
+    this._reportDiagnostic,
     this.catchClauses,
   );
 
@@ -545,7 +543,7 @@ class _CatchClausesVerifier {
     if (currentType == null || currentType.isDartCoreObject) {
       if (catchClause != catchClauses.last) {
         var index = catchClauses.indexOf(catchClause);
-        _errorReporter(
+        _reportDiagnostic(
           catchClauses[index + 1],
           catchClauses.last,
           WarningCode.DEAD_CODE_CATCH_FOLLOWING_CATCH,
@@ -560,7 +558,7 @@ class _CatchClausesVerifier {
     // subtype of a previous on-catch exception type.
     for (var type in _visitedTypes) {
       if (_typeSystem.isSubtypeOf(currentType, type)) {
-        _errorReporter(
+        _reportDiagnostic(
           catchClause,
           catchClauses.last,
           WarningCode.DEAD_CODE_ON_CATCH_SUBTYPE,

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

@@ -301,7 +301,7 @@ class DuplicateDefinitionVerifier {
       return;
     }
 
-    ErrorCode getError(Element previous, Element current) {
+    DiagnosticCode getDiagnostic(Element previous, Element current) {
       if (previous is FieldFormalParameterElement &&
           current is FieldFormalParameterElement) {
         return CompileTimeErrorCode.DUPLICATE_FIELD_FORMAL_PARAMETER;
@@ -316,7 +316,7 @@ class DuplicateDefinitionVerifier {
           _reportedTokens.add(identifier);
           _errorReporter.reportError(
             _diagnosticFactory.duplicateDefinition(
-              getError(previous, element),
+              getDiagnostic(previous, element),
               element,
               previous,
               [lookupName],
@@ -332,7 +332,7 @@ class DuplicateDefinitionVerifier {
         _reportedTokens.add(identifier);
         _errorReporter.reportError(
           _diagnosticFactory.duplicateDefinition(
-            getError(previous, element),
+            getDiagnostic(previous, element),
             element,
             previous,
             [lookupName],

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

@@ -20,10 +20,10 @@ class IgnoreValidator {
   /// Error codes used to report `unnecessary_ignore`s.
   /// These codes are set when the `UnnecessaryIgnore` lint rule is instantiated and
   /// registered by the linter.
-  static late ErrorCode unnecessaryIgnoreLocationLintCode;
-  static late ErrorCode unnecessaryIgnoreFileLintCode;
-  static late ErrorCode unnecessaryIgnoreNameLocationLintCode;
-  static late ErrorCode unnecessaryIgnoreNameFileLintCode;
+  static late DiagnosticCode unnecessaryIgnoreLocationLintCode;
+  static late DiagnosticCode unnecessaryIgnoreFileLintCode;
+  static late DiagnosticCode unnecessaryIgnoreNameLocationLintCode;
+  static late DiagnosticCode unnecessaryIgnoreNameFileLintCode;
 
   /// The error reporter to which errors are to be reported.
   final ErrorReporter _errorReporter;
@@ -260,7 +260,7 @@ class IgnoreValidator {
           }
         }
 
-        late ErrorCode lintCode;
+        late DiagnosticCode lintCode;
         if (forFile) {
           lintCode =
               diagnosticsOnLine > 1

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

@@ -354,7 +354,7 @@ class _ClassVerifier {
           superMember: interfaceElement,
           errorReporter: reporter,
           errorNode: classNameToken,
-          errorCode:
+          diagnosticCode:
               concreteElement is SetterElement2OrMember
                   ? CompileTimeErrorCode.INVALID_IMPLEMENTATION_OVERRIDE_SETTER
                   : CompileTimeErrorCode.INVALID_IMPLEMENTATION_OVERRIDE,
@@ -408,7 +408,7 @@ class _ClassVerifier {
         superMember: superMember.asElement2,
         errorReporter: reporter,
         errorNode: node,
-        errorCode:
+        diagnosticCode:
             member is SetterElement
                 ? CompileTimeErrorCode.INVALID_OVERRIDE_SETTER
                 : CompileTimeErrorCode.INVALID_OVERRIDE,
@@ -481,7 +481,10 @@ class _ClassVerifier {
 
   /// Verify that the given [namedType] does not extend, implement, or mixes-in
   /// types such as `num` or `String`.
-  bool _checkDirectSuperTypeNode(NamedType namedType, ErrorCode errorCode) {
+  bool _checkDirectSuperTypeNode(
+    NamedType namedType,
+    DiagnosticCode diagnosticCode,
+  ) {
     if (namedType.isSynthetic) {
       return false;
     }
@@ -496,7 +499,7 @@ class _ClassVerifier {
         );
       },
       notSubtypable: () {
-        reporter.atNode(namedType, errorCode, arguments: [type]);
+        reporter.atNode(namedType, diagnosticCode, arguments: [type]);
       },
     );
   }
@@ -746,7 +749,7 @@ class _ClassVerifier {
 
   /// Return the error code that should be used when the given class [element]
   /// references itself directly.
-  ErrorCode _getRecursiveErrorCode(InterfaceElement element) {
+  DiagnosticCode _getRecursiveErrorCode(InterfaceElement element) {
     if (element.supertype?.element3 == classElement.asElement2) {
       return CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE_EXTENDS;
     }

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

@@ -31,36 +31,36 @@ class NullableDereferenceVerifier {
        _resolver = resolver;
 
   bool expression(
-    ErrorCode errorCode,
+    DiagnosticCode diagnosticCode,
     Expression expression, {
     DartType? type,
   }) {
     type ??= expression.typeOrThrow;
-    return _check(errorCode, expression, type);
+    return _check(diagnosticCode, expression, type);
   }
 
   void report(
-    ErrorCode errorCode,
+    DiagnosticCode diagnosticCode,
     SyntacticEntity errorEntity,
     DartType receiverType, {
     List<String> arguments = const <String>[],
     List<DiagnosticMessage>? messages,
   }) {
     if (receiverType == _typeSystem.typeProvider.nullType) {
-      errorCode = CompileTimeErrorCode.INVALID_USE_OF_NULL_VALUE;
+      diagnosticCode = CompileTimeErrorCode.INVALID_USE_OF_NULL_VALUE;
       arguments = [];
     }
     if (errorEntity is AstNode) {
       _errorReporter.atNode(
         errorEntity,
-        errorCode,
+        diagnosticCode,
         arguments: arguments,
         contextMessages: messages,
       );
     } else if (errorEntity is Token) {
       _errorReporter.atToken(
         errorEntity,
-        errorCode,
+        diagnosticCode,
         arguments: arguments,
         contextMessages: messages,
       );
@@ -75,7 +75,11 @@ class NullableDereferenceVerifier {
   /// receiver is the implicit `this`, the name of the invocation.
   ///
   /// Returns whether [receiverType] was reported.
-  bool _check(ErrorCode errorCode, AstNode errorNode, DartType receiverType) {
+  bool _check(
+    DiagnosticCode diagnosticCode,
+    AstNode errorNode,
+    DartType receiverType,
+  ) {
     if (receiverType is DynamicType ||
         receiverType is InvalidType ||
         !_typeSystem.isPotentiallyNullable(receiverType)) {
@@ -89,7 +93,7 @@ class NullableDereferenceVerifier {
         _resolver.flowAnalysis.flow?.whyNotPromoted(errorNode)(),
       );
     }
-    report(errorCode, errorNode, receiverType, messages: messages);
+    report(diagnosticCode, errorNode, receiverType, messages: messages);
     return true;
   }
 }