analyzer: Use new DiagnosticCode name in some directories

Work towards #60635

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

Author: srawlins

pkg/analyzer/lib/diagnostic/diagnostic.dart

@@ -16,8 +16,9 @@ import 'package:analyzer/src/generated/java_core.dart';
 ///
 /// [guidelines]: https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/implementation/diagnostics.md
 class Diagnostic {
-  /// The error code associated with the diagnostic.
-  final ErrorCode errorCode;
+  /// The diagnostic code associated with the diagnostic.
+  // TODO(srawlins): Rename this to `diagnosticCode`.
+  final DiagnosticCode errorCode;
 
   /// A list of messages that provide context for understanding the problem
   /// being reported. The list will be empty if there are no such messages.

pkg/analyzer/lib/error/error.dart

@@ -2,6 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+/// @docImport 'package:analyzer/error/listener.dart';
+library;
+
 import 'dart:collection';
 
 import 'package:_fe_analyzer_shared/src/base/errors.dart';
@@ -21,30 +24,30 @@ export 'package:_fe_analyzer_shared/src/base/errors.dart'
 export 'package:analyzer/src/dart/error/lint_codes.dart' show LintCode;
 export 'package:analyzer/src/error/error_code_values.g.dart';
 
-/// The lazy initialized map from [ErrorCode.uniqueName] to the [ErrorCode]
-/// instance.
-final HashMap<String, ErrorCode> _uniqueNameToCodeMap =
+/// The lazy initialized map from [ErrorCode.uniqueName] to the
+/// [DiagnosticCode] instance.
+final HashMap<String, DiagnosticCode> _uniqueNameToCodeMap =
     _computeUniqueNameToCodeMap();
 
-/// Return the [ErrorCode] with the given [uniqueName], or `null` if not
+/// Return the [DiagnosticCode] with the given [uniqueName], or `null` if not
 /// found.
-ErrorCode? errorCodeByUniqueName(String uniqueName) {
+DiagnosticCode? errorCodeByUniqueName(String uniqueName) {
   return _uniqueNameToCodeMap[uniqueName];
 }
 
-/// Return the map from [ErrorCode.uniqueName] to the [ErrorCode] instance
+/// Return the map from [ErrorCode.uniqueName] to the [DiagnosticCode] instance
 /// for all [errorCodeValues].
-HashMap<String, ErrorCode> _computeUniqueNameToCodeMap() {
-  var result = HashMap<String, ErrorCode>();
-  for (ErrorCode errorCode in errorCodeValues) {
-    var uniqueName = errorCode.uniqueName;
+HashMap<String, DiagnosticCode> _computeUniqueNameToCodeMap() {
+  var result = HashMap<String, DiagnosticCode>();
+  for (DiagnosticCode diagnosticCode in errorCodeValues) {
+    var uniqueName = diagnosticCode.uniqueName;
     assert(() {
       if (result.containsKey(uniqueName)) {
         throw StateError('Not unique: $uniqueName');
       }
       return true;
     }());
-    result[uniqueName] = errorCode;
+    result[uniqueName] = diagnosticCode;
   }
   return result;
 }

pkg/analyzer/lib/error/listener.dart

@@ -69,7 +69,7 @@ class ErrorReporter {
   /// The location of the diagnostic will be the name of the [node].
   void atConstructorDeclaration(
     ConstructorDeclaration node,
-    ErrorCode errorCode, {
+    DiagnosticCode errorCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
     Object? data,
@@ -95,7 +95,7 @@ class ErrorReporter {
   @experimental
   void atElement2(
     Element element2,
-    ErrorCode diagnosticCode, {
+    DiagnosticCode diagnosticCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
     Object? data,
@@ -115,7 +115,7 @@ class ErrorReporter {
   /// The [entity] is used to compute the location of the error.
   void atEntity(
     SyntacticEntity entity,
-    ErrorCode errorCode, {
+    DiagnosticCode errorCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
     Object? data,
@@ -134,7 +134,7 @@ class ErrorReporter {
   /// The [node] is used to compute the location of the error.
   void atNode(
     AstNode node,
-    ErrorCode diagnosticCode, {
+    DiagnosticCode diagnosticCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
     Object? data,
@@ -154,7 +154,7 @@ class ErrorReporter {
   void atOffset({
     required int offset,
     required int length,
-    required ErrorCode errorCode,
+    required DiagnosticCode errorCode,
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
     Object? data,
@@ -198,7 +198,7 @@ class ErrorReporter {
   /// The [span] is used to compute the location of the error.
   void atSourceSpan(
     SourceSpan span,
-    ErrorCode errorCode, {
+    DiagnosticCode errorCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
     Object? data,
@@ -217,7 +217,7 @@ class ErrorReporter {
   /// used to compute the location of the error.
   void atToken(
     Token token,
-    ErrorCode diagnosticCode, {
+    DiagnosticCode diagnosticCode, {
     List<Object>? arguments,
     List<DiagnosticMessage>? contextMessages,
     Object? data,

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -2665,9 +2665,9 @@ abstract class DriverWatcher {
 class ErrorEncoding {
   static AnalysisError? decode(Source source, AnalysisDriverUnitError error) {
     String errorName = error.uniqueName;
-    ErrorCode? errorCode =
+    DiagnosticCode? diagnosticCode =
         errorCodeByUniqueName(errorName) ?? _lintCodeByUniqueName(errorName);
-    if (errorCode == null) {
+    if (diagnosticCode == null) {
       // This could fail because the error code is no longer defined, or, in
       // the case of a lint rule, if the lint rule has been disabled since the
       // errors were written.
@@ -2695,7 +2695,7 @@ class ErrorEncoding {
       source: source,
       offset: error.offset,
       length: error.length,
-      errorCode: errorCode,
+      errorCode: diagnosticCode,
       message: error.message,
       correctionMessage: error.correction.isEmpty ? null : error.correction,
       contextMessages: contextMessages,
@@ -2726,10 +2726,10 @@ class ErrorEncoding {
     );
   }
 
-  /// Return the lint code with the given [errorName], or `null` if there is no
-  /// lint registered with that name.
-  static ErrorCode? _lintCodeByUniqueName(String errorName) {
-    return linter.Registry.ruleRegistry.codeForUniqueName(errorName);
+  /// Returns the lint code with the given [diagnosticName], or `null` if there
+  /// is no lint registered with that name.
+  static DiagnosticCode? _lintCodeByUniqueName(String diagnosticName) {
+    return linter.Registry.ruleRegistry.codeForUniqueName(diagnosticName);
   }
 }
 

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

@@ -1003,11 +1003,15 @@ class LibraryAnalyzer {
     directive?.element = partElement;
 
     void reportOnDirectiveUri(
-      ErrorCode errorCode, {
+      DiagnosticCode diagnosticCode, {
       List<Object>? arguments = const [],
     }) {
       if (directive != null) {
-        errorReporter.atNode(directive.uri, errorCode, arguments: arguments);
+        errorReporter.atNode(
+          directive.uri,
+          diagnosticCode,
+          arguments: arguments,
+        );
       }
     }
 
@@ -1036,15 +1040,15 @@ class LibraryAnalyzer {
     var includedKind = includedFile.kind;
 
     if (includedKind is! PartFileKind) {
-      ErrorCode errorCode;
+      DiagnosticCode diagnosticCode;
       if (includedFile.exists) {
-        errorCode = CompileTimeErrorCode.PART_OF_NON_PART;
+        diagnosticCode = CompileTimeErrorCode.PART_OF_NON_PART;
       } else if (isGeneratedSource(includedFile.source)) {
-        errorCode = CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED;
+        diagnosticCode = CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED;
       } else {
-        errorCode = CompileTimeErrorCode.URI_DOES_NOT_EXIST;
+        diagnosticCode = CompileTimeErrorCode.URI_DOES_NOT_EXIST;
       }
-      reportOnDirectiveUri(errorCode, arguments: [includedFile.uriStr]);
+      reportOnDirectiveUri(diagnosticCode, arguments: [includedFile.uriStr]);
       return;
     }