analysis_server: Use new DiagnosticCode name

srawlins · Commit Queue · commit 3a9f4331dd8f · 2025-04-30T09:29:50.000-07:00
Work towards #60635 Change-Id: I76c3f7b3ed890b808f3831f2b7776bd1988a223d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/425407 Commit-Queue: Samuel Rawlins <srawlins@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/lsp/mapping.dart b/pkg/analysis_server/lib/src/lsp/mapping.dart
@@ -53,19 +53,21 @@ final completionFilterTextSplitPattern = RegExp(r'=>|[\(]');
 final completionSetterTypePattern = RegExp(r'^\((\S+)\s+\S+\)$');
 
 final diagnosticTagsForErrorCode = <String, List<lsp.DiagnosticTag>>{
-  _errorCode(WarningCode.DEAD_CODE): [lsp.DiagnosticTag.Unnecessary],
-  _errorCode(HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE): [
+  _diagnosticCode(WarningCode.DEAD_CODE): [lsp.DiagnosticTag.Unnecessary],
+  _diagnosticCode(HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE): [
     lsp.DiagnosticTag.Deprecated,
   ],
-  _errorCode(HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE_WITH_MESSAGE): [
+  _diagnosticCode(
+    HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE_WITH_MESSAGE,
+  ): [lsp.DiagnosticTag.Deprecated],
+  _diagnosticCode(HintCode.DEPRECATED_MEMBER_USE): [
     lsp.DiagnosticTag.Deprecated,
   ],
-  _errorCode(HintCode.DEPRECATED_MEMBER_USE): [lsp.DiagnosticTag.Deprecated],
   'deprecated_member_use_from_same_package': [lsp.DiagnosticTag.Deprecated],
   'deprecated_member_use_from_same_package_with_message': [
     lsp.DiagnosticTag.Deprecated,
   ],
-  _errorCode(HintCode.DEPRECATED_MEMBER_USE_WITH_MESSAGE): [
+  _diagnosticCode(HintCode.DEPRECATED_MEMBER_USE_WITH_MESSAGE): [
     lsp.DiagnosticTag.Deprecated,
   ],
 };
@@ -1846,7 +1848,7 @@ lsp.MarkupContent _asMarkup(
   return lsp.MarkupContent(kind: format, value: content);
 }
 
-String _errorCode(server.ErrorCode code) => code.name.toLowerCase();
+String _diagnosticCode(server.DiagnosticCode code) => code.name.toLowerCase();
 
 /// Additional details about a completion that may be formatted differently
 /// depending on the client capabilities.
diff --git a/pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart b/pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart
@@ -299,8 +299,11 @@ class StatementCompletionProcessor {
   void _checkExpressions(AstNode node) {
     // Note: This may queue edits that have to be accounted for later.
     // See _lengthOfInsertions().
-    AstNode? errorMatching(ErrorCode errorCode, {Pattern? partialMatch}) {
-      var error = _findError(errorCode, partialMatch: partialMatch);
+    AstNode? diagnosticMatching(
+      DiagnosticCode diagnosticCode, {
+      Pattern? partialMatch,
+    }) {
+      var error = _findError(diagnosticCode, partialMatch: partialMatch);
       if (error == null) {
         return null;
       }
@@ -310,7 +313,7 @@ class StatementCompletionProcessor {
           : null;
     }
 
-    var expr = errorMatching(ScannerErrorCode.UNTERMINATED_STRING_LITERAL);
+    var expr = diagnosticMatching(ScannerErrorCode.UNTERMINATED_STRING_LITERAL);
     if (expr != null) {
       var source = utils.getNodeText(expr);
       var content = source;
@@ -340,8 +343,14 @@ class StatementCompletionProcessor {
       _addInsertEdit(loc, delimiter);
     }
     expr =
-        errorMatching(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "']'") ??
-        errorMatching(ScannerErrorCode.EXPECTED_TOKEN, partialMatch: "']'");
+        diagnosticMatching(
+          ParserErrorCode.EXPECTED_TOKEN,
+          partialMatch: "']'",
+        ) ??
+        diagnosticMatching(
+          ScannerErrorCode.EXPECTED_TOKEN,
+          partialMatch: "']'",
+        );
     if (expr != null) {
       expr = expr.thisOrAncestorOfType<ListLiteral>();
       if (expr is ListLiteral) {
@@ -1161,7 +1170,10 @@ class StatementCompletionProcessor {
     );
   }
 
-  engine.AnalysisError? _findError(ErrorCode code, {Pattern? partialMatch}) {
+  engine.AnalysisError? _findError(
+    DiagnosticCode code, {
+    Pattern? partialMatch,
+  }) {
     return errors.firstWhereOrNull(
       (err) =>
           err.errorCode == code &&
@@ -1264,8 +1276,8 @@ class StatementCompletionProcessor {
     return Position(file, offset);
   }
 
-  void _removeError(ErrorCode errorCode, {Pattern? partialMatch}) {
-    var error = _findError(errorCode, partialMatch: partialMatch);
+  void _removeError(DiagnosticCode diagnosticCode, {Pattern? partialMatch}) {
+    var error = _findError(diagnosticCode, partialMatch: partialMatch);
     if (error != null) {
       errors.remove(error);
     }
diff --git a/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart b/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart
@@ -87,7 +87,7 @@ class BulkFixProcessor {
   /// The expectation is that only one of the correction producers will produce
   /// a change for a given fix. If more than one change is produced the result
   /// will almost certainly be invalid code.
-  static const Map<ErrorCode, List<MultiProducerGenerator>>
+  static const Map<DiagnosticCode, List<MultiProducerGenerator>>
   nonLintMultiProducerMap = {
     CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE: [DataDriven.new],
     CompileTimeErrorCode.CAST_TO_NON_TYPE: [DataDriven.new],
@@ -152,10 +152,12 @@ class BulkFixProcessor {
   };
 
   /// Cached results of [_canBulkFix].
-  static final Map<ErrorCode, bool> _bulkFixableErrorCodes = {};
+  static final Map<DiagnosticCode, bool> _bulkFixableCodes = {};
 
-  static final Set<String> _errorCodes =
-      errorCodeValues.map((ErrorCode code) => code.name.toLowerCase()).toSet();
+  static final Set<String> _diagnosticCodes =
+      errorCodeValues
+          .map((DiagnosticCode code) => code.name.toLowerCase())
+          .toSet();
 
   static final Set<String> _lintCodes =
       Registry.ruleRegistry.rules.map((rule) => rule.name).toSet();
@@ -487,7 +489,7 @@ class BulkFixProcessor {
     if (_codes != null) {
       var undefinedCodes = <String>[];
       for (var code in _codes) {
-        if (!_errorCodes.contains(code) && !_lintCodes.contains(code)) {
+        if (!_diagnosticCodes.contains(code) && !_lintCodes.contains(code)) {
           undefinedCodes.add(code);
         }
       }
@@ -960,8 +962,8 @@ class BulkFixProcessor {
     return [];
   }
 
-  /// Returns whether [errorCode] is an error that can be fixed in bulk.
-  static bool _canBulkFix(ErrorCode errorCode) {
+  /// Returns whether [diagnosticCode] is an error that can be fixed in bulk.
+  static bool _canBulkFix(DiagnosticCode diagnosticCode) {
     bool hasBulkFixProducers(List<ProducerGenerator>? generators) {
       return generators != null &&
           generators.any(
@@ -972,19 +974,19 @@ class BulkFixProcessor {
           );
     }
 
-    return _bulkFixableErrorCodes.putIfAbsent(errorCode, () {
-      if (errorCode is LintCode) {
-        var producers = registeredFixGenerators.lintProducers[errorCode];
+    return _bulkFixableCodes.putIfAbsent(diagnosticCode, () {
+      if (diagnosticCode is LintCode) {
+        var producers = registeredFixGenerators.lintProducers[diagnosticCode];
         if (hasBulkFixProducers(producers)) {
           return true;
         }
 
         return registeredFixGenerators.lintMultiProducers.containsKey(
-          errorCode,
+          diagnosticCode,
         );
       }
 
-      var producers = registeredFixGenerators.nonLintProducers[errorCode];
+      var producers = registeredFixGenerators.nonLintProducers[diagnosticCode];
       if (hasBulkFixProducers(producers)) {
         return true;
       }
@@ -993,9 +995,9 @@ class BulkFixProcessor {
       // producers may vary depending on the resolved unit (we must configure
       // them before we can determine the producers).
       return registeredFixGenerators.nonLintMultiProducers.containsKey(
-            errorCode,
+            diagnosticCode,
           ) ||
-          BulkFixProcessor.nonLintMultiProducerMap.containsKey(errorCode);
+          BulkFixProcessor.nonLintMultiProducerMap.containsKey(diagnosticCode);
     });
   }
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_required_argument.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_required_argument.dart
@@ -32,8 +32,8 @@ class AddMissingRequiredArgument extends ResolvedCorrectionProducer {
   @override
   FixKind get fixKind => DartFixKind.ADD_MISSING_REQUIRED_ARGUMENT;
 
-  /// All the error codes that this fix can be applied to.
-  List<ErrorCode> get _errorCodesWhereThisIsValid {
+  /// All the diagnostic codes that this fix can be applied to.
+  List<DiagnosticCode> get _codesWhereThisIsValid {
     var producerGenerators = [AddMissingRequiredArgument.new];
     var nonLintProducers = registeredFixGenerators.nonLintProducers;
     return [
@@ -71,7 +71,7 @@ class AddMissingRequiredArgument extends ResolvedCorrectionProducer {
       return;
     }
 
-    var validErrors = _errorCodesWhereThisIsValid;
+    var validErrors = _codesWhereThisIsValid;
     var errors = unitResult.errors.where(
       (e) => diagnostic.sameRangeAs(e) && validErrors.contains(e.errorCode),
     );
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/import_library.dart b/pkg/analysis_server/lib/src/services/correction/dart/import_library.dart
@@ -80,9 +80,9 @@ class ImportLibrary extends MultiCorrectionProducer {
     ];
   }
 
-  /// A map of all the error codes that this fix can be applied to and the
+  /// A map of all the diagnostic codes that this fix can be applied to and the
   /// generators that can be used to apply the fix.
-  Map<ErrorCode, List<MultiProducerGenerator>> get _errorCodesWhereThisIsValid {
+  Map<DiagnosticCode, List<MultiProducerGenerator>> get _codesWhereThisIsValid {
     var producerGenerators = _ImportKind.values.map((key) => key.fn).toList();
     var nonLintMultiProducers = registeredFixGenerators.nonLintMultiProducers;
     return {
@@ -720,7 +720,7 @@ class ImportLibrary extends MultiCorrectionProducer {
   /// Searches all diagnostics reported for this compilation unit for unresolved
   /// names where this fix can be applied besides the current diagnostic.
   Future<Set<String>> _otherUnresolvedNames(String? prefix, String name) async {
-    var errorsForThisFix = _errorCodesWhereThisIsValid;
+    var errorsForThisFix = _codesWhereThisIsValid;
     var errors =
         <AnalysisError, List<MultiProducerGenerator>>{}..addEntries(
           unitResult.errors.map((error) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_const.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_const.dart
@@ -134,7 +134,7 @@ abstract class _RemoveConst extends ParsedCorrectionProducer {
 
   /// A map of all the error codes that this fix can be applied to and the
   /// generators that can be used to apply the fix.
-  Map<ErrorCode, List<ProducerGenerator>> get _errorCodesWhereThisIsValid {
+  Map<DiagnosticCode, List<ProducerGenerator>> get _codesWhereThisIsValid {
     var constructors = [RemoveUnnecessaryConst.new, RemoveConst.new];
     var nonLintMultiProducers = registeredFixGenerators.nonLintProducers;
     return {
@@ -171,10 +171,8 @@ abstract class _RemoveConst extends ParsedCorrectionProducer {
         if (constantContext != null) {
           var constKeyword = constantContext.$2;
           if (constKeyword != null) {
-            var validErrors = _errorCodesWhereThisIsValid.keys.toList();
-            var validDiagnostics = unitResult.errors.whereErrorCodeIn(
-              validErrors,
-            );
+            var validErrors = _codesWhereThisIsValid.keys.toList();
+            var validDiagnostics = unitResult.errors.whereCodeIn(validErrors);
             switch (constantContext.$1) {
               case InstanceCreationExpression contextNode:
                 var (:constNodes, :nodesWithDiagnostic) = contextNode
@@ -282,10 +280,8 @@ extension on List<AstNode> {
 }
 
 extension on List<AnalysisError> {
-  List<AnalysisError> whereErrorCodeIn(List<ErrorCode> errors) =>
-      where((error) {
-        return errors.contains(error.errorCode);
-      }).toList();
+  List<AnalysisError> whereCodeIn(List<DiagnosticCode> codes) =>
+      where((c) => codes.contains(c.errorCode)).toList();
 }
 
 extension<T> on Iterable<T> {
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
@@ -29,7 +29,7 @@ import 'package:yaml_edit/yaml_edit.dart';
 
 /// The generator used to generate fixes in analysis options files.
 class AnalysisOptionsFixGenerator {
-  static const List<ErrorCode> codesWithFixes = [
+  static const List<DiagnosticCode> codesWithFixes = [
     AnalysisOptionsWarningCode.DEPRECATED_LINT,
     AnalysisOptionsWarningCode.ANALYSIS_OPTION_DEPRECATED_WITH_REPLACEMENT,
     AnalysisOptionsWarningCode.DUPLICATE_RULE,
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_error_code.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_error_code.dart
@@ -6,7 +6,7 @@ import 'package:analyzer/error/error.dart';
 
 /// An error code representing a problem in a file containing an encoding of a
 /// transform set.
-class TransformSetErrorCode extends ErrorCode {
+class TransformSetErrorCode extends DiagnosticCode {
   /// Parameters:
   /// 0: the conflicting key
   /// 1: the key that it conflicts with
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart
@@ -22,7 +22,7 @@ import 'package:yaml/yaml.dart';
 
 /// The generator used to generate fixes in pubspec.yaml files.
 class PubspecFixGenerator {
-  static const List<ErrorCode> codesWithFixes = [
+  static const List<DiagnosticCode> codesWithFixes = [
     PubspecWarningCode.MISSING_DEPENDENCY,
     PubspecWarningCode.MISSING_NAME,
   ];
@@ -154,7 +154,7 @@ class PubspecFixGenerator {
     fixes.add(Fix(kind: kind, change: change));
   }
 
-  Future<void> _addMissingDependency(ErrorCode errorCode) async {
+  Future<void> _addMissingDependency(DiagnosticCode diagnosticCode) async {
     var node = this.node;
     if (node is! YamlMap) {
       return;
diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
@@ -563,7 +563,7 @@ final _builtInLintMultiGenerators = {
   ],
 };
 
-final _builtInNonLintGenerators = <ErrorCode, List<ProducerGenerator>>{
+final _builtInNonLintGenerators = <DiagnosticCode, List<ProducerGenerator>>{
   CompileTimeErrorCode.ABSTRACT_FIELD_INITIALIZER: [
     RemoveAbstract.new,
     RemoveInitializer.new,
diff --git a/pkg/analysis_server/test/protocol_server_test.dart b/pkg/analysis_server/test/protocol_server_test.dart
@@ -138,7 +138,9 @@ class AnalysisErrorTest {
   void test_fromEngine_hasUrl() {
     engineError = MockAnalysisError(
       source: source,
-      errorCode: MockErrorCode(url: 'http://codes.dartlang.org/TEST_ERROR'),
+      errorCode: MockDiagnosticCode(
+        url: 'http://codes.dartlang.org/TEST_ERROR',
+      ),
       offset: 10,
       length: 20,
       message: 'my message',
@@ -325,7 +327,7 @@ class EnumTester<EngineEnum, ApiEnum> {
 
 class MockAnalysisError implements engine.AnalysisError {
   final MockSource? _source;
-  final engine.ErrorCode? _errorCode;
+  final engine.DiagnosticCode? _diagnosticCode;
   final int? _offset;
   final int? _length;
   final String? _message;
@@ -338,15 +340,15 @@ class MockAnalysisError implements engine.AnalysisError {
 
   MockAnalysisError({
     MockSource? source,
-    engine.ErrorCode? errorCode,
+    engine.DiagnosticCode? errorCode,
     int? offset,
     int? length,
     String? message,
     String? correction,
     DiagnosticMessage? problemMessage,
     String? correctionMessage,
   }) : _source = source,
-       _errorCode = errorCode,
+       _diagnosticCode = errorCode,
        _offset = offset,
        _length = length,
        _message = message,
@@ -364,7 +366,7 @@ class MockAnalysisError implements engine.AnalysisError {
   Object? get data => throw UnimplementedError();
 
   @override
-  engine.ErrorCode get errorCode => _errorCode!;
+  engine.DiagnosticCode get errorCode => _diagnosticCode!;
 
   @override
   int get length => _length!;
@@ -385,7 +387,7 @@ class MockAnalysisError implements engine.AnalysisError {
   engine.Source get source => _source!;
 }
 
-class MockErrorCode implements engine.ErrorCode {
+class MockDiagnosticCode implements engine.DiagnosticCode {
   @override
   engine.ErrorType type;
 
@@ -398,7 +400,7 @@ class MockErrorCode implements engine.ErrorCode {
   @override
   String? url;
 
-  MockErrorCode({
+  MockDiagnosticCode({
     this.type = engine.ErrorType.COMPILE_TIME_ERROR,
     this.errorSeverity = engine.ErrorSeverity.ERROR,
     this.name = 'TEST_ERROR',
diff --git a/pkg/analysis_server/test/services/linter/linter_test.dart b/pkg/analysis_server/test/services/linter/linter_test.dart
@@ -69,7 +69,7 @@ linter:
     );
   }
 
-  void validate(String source, List<ErrorCode> expected) {
+  void validate(String source, List<DiagnosticCode> expected) {
     var options = AnalysisOptionsProvider().getOptionsFromString(source);
     validator.validate(reporter, options);
     expect(
diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/code_fragment_parser_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/code_fragment_parser_test.dart
@@ -57,7 +57,7 @@ abstract class AbstractCodeFragmentParserTest {
 
   // ignore:unreachable_from_main
   ExpectedError error(
-    ErrorCode code,
+    DiagnosticCode code,
     int offset,
     int length, {
     String? message,
diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_parser_test_support.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_parser_test_support.dart
@@ -29,7 +29,7 @@ abstract class AbstractTransformSetParserTest {
   }
 
   ExpectedError error(
-    ErrorCode code,
+    DiagnosticCode code,
     int offset,
     int length, {
     String? text,
diff --git a/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart b/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart
diff --git a/pkg/analysis_server/test/src/services/correction/fix/fix_processor_map_test.dart b/pkg/analysis_server/test/src/services/correction/fix/fix_processor_map_test.dart
diff --git a/pkg/analysis_server/test/src/services/correction/fix/merge_combinators_test.dart b/pkg/analysis_server/test/src/services/correction/fix/merge_combinators_test.dart
diff --git a/pkg/analysis_server/test/utils/test_support.dart b/pkg/analysis_server/test/utils/test_support.dart
diff --git a/pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart b/pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart
