analyzer: Use DiagnosticSeverity in analyzer packages

srawlins · Commit Queue · commit cfa4be3d93b1 · 2025-05-03T17:14:04.000-07:00
Work towards #60635 DiagnosticSeverity is the new name for ErrorSeverity. Change-Id: I9d1040f23d4fe8affb234ff62527133e439adf50 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426341 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analyzer/lib/diagnostic/diagnostic.dart b/pkg/analyzer/lib/diagnostic/diagnostic.dart
@@ -126,11 +126,11 @@ class Diagnostic {
 
   Severity get severity {
     switch (errorCode.errorSeverity) {
-      case ErrorSeverity.ERROR:
+      case DiagnosticSeverity.ERROR:
         return Severity.error;
-      case ErrorSeverity.WARNING:
+      case DiagnosticSeverity.WARNING:
         return Severity.warning;
-      case ErrorSeverity.INFO:
+      case DiagnosticSeverity.INFO:
         return Severity.info;
       default:
         throw StateError('Invalid error severity: ${errorCode.errorSeverity}');
diff --git a/pkg/analyzer/lib/source/error_processor.dart b/pkg/analyzer/lib/source/error_processor.dart
@@ -10,10 +10,10 @@ import 'package:meta/meta.dart';
 import 'package:yaml/yaml.dart';
 
 /// String identifiers mapped to associated severities.
-const Map<String, ErrorSeverity> severityMap = {
-  'error': ErrorSeverity.ERROR,
-  'info': ErrorSeverity.INFO,
-  'warning': ErrorSeverity.WARNING,
+const Map<String, DiagnosticSeverity> severityMap = {
+  'error': DiagnosticSeverity.ERROR,
+  'info': DiagnosticSeverity.INFO,
+  'warning': DiagnosticSeverity.WARNING,
 };
 
 /// Error processor configuration derived from analysis (or embedder) options.
@@ -53,15 +53,15 @@ class ErrorConfig {
   }
 }
 
-/// Process errors by filtering or changing associated [ErrorSeverity].
+/// Process errors by filtering or changing associated [DiagnosticSeverity].
 class ErrorProcessor {
   /// The code name of the associated error.
   final String code;
 
   /// The desired severity of the processed error.
   ///
   /// If `null`, this processor will "filter" the associated error code.
-  final ErrorSeverity? severity;
+  final DiagnosticSeverity? severity;
 
   /// Create an error processor that assigns errors with this [code] the
   /// given [severity].
diff --git a/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart b/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart
@@ -59,7 +59,7 @@ class AnalysisOptionsErrorCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.ERROR;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.ERROR;
 
   @override
   DiagnosticType get type => DiagnosticType.COMPILE_TIME_ERROR;
@@ -323,7 +323,7 @@ class AnalysisOptionsWarningCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.WARNING;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.WARNING;
 
   @override
   DiagnosticType get type => DiagnosticType.STATIC_WARNING;
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -2337,7 +2337,7 @@ class AnalysisDriver {
   ) {
     for (var error in errors) {
       var severity = error.errorCode.errorSeverity;
-      if (severity == ErrorSeverity.ERROR) {
+      if (severity == DiagnosticSeverity.ERROR) {
         file.hasErrorOrWarning = true;
         return;
       }
diff --git a/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart b/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart
@@ -536,7 +536,8 @@ class FfiCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => DiagnosticType.COMPILE_TIME_ERROR.severity;
+  DiagnosticSeverity get errorSeverity =>
+      DiagnosticType.COMPILE_TIME_ERROR.severity;
 
   @override
   DiagnosticType get type => DiagnosticType.COMPILE_TIME_ERROR;
diff --git a/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
@@ -121,7 +121,7 @@ class HintCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => DiagnosticType.HINT.severity;
+  DiagnosticSeverity get errorSeverity => DiagnosticType.HINT.severity;
 
   @override
   DiagnosticType get type => DiagnosticType.HINT;
diff --git a/pkg/analyzer/lib/src/dart/error/lint_codes.dart b/pkg/analyzer/lib/src/dart/error/lint_codes.dart
@@ -29,7 +29,7 @@ class LintCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.INFO;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.INFO;
 
   @override
   int get hashCode => uniqueName.hashCode;
diff --git a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
@@ -2072,7 +2072,7 @@ class ParserErrorCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.ERROR;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.ERROR;
 
   @override
   DiagnosticType get type => DiagnosticType.SYNTACTIC_ERROR;
diff --git a/pkg/analyzer/lib/src/dart/error/todo_codes.dart b/pkg/analyzer/lib/src/dart/error/todo_codes.dart
@@ -86,7 +86,7 @@ class TodoCode extends ErrorCode {
     : super(problemMessage: "{0}", name: name, uniqueName: 'TodoCode.$name');
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.INFO;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.INFO;
 
   @override
   DiagnosticType get type => DiagnosticType.TODO;
diff --git a/pkg/analyzer/lib/src/error/codes.g.dart b/pkg/analyzer/lib/src/error/codes.g.dart
@@ -6074,7 +6074,8 @@ class CompileTimeErrorCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => DiagnosticType.COMPILE_TIME_ERROR.severity;
+  DiagnosticSeverity get errorSeverity =>
+      DiagnosticType.COMPILE_TIME_ERROR.severity;
 
   @override
   DiagnosticType get type => DiagnosticType.COMPILE_TIME_ERROR;
@@ -6203,7 +6204,7 @@ class StaticWarningCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.WARNING;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.WARNING;
 
   @override
   DiagnosticType get type => DiagnosticType.STATIC_WARNING;
@@ -7793,7 +7794,7 @@ class WarningCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.WARNING;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.WARNING;
 
   @override
   DiagnosticType get type => DiagnosticType.STATIC_WARNING;
diff --git a/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart b/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart
@@ -127,7 +127,7 @@ class ManifestWarningCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.WARNING;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.WARNING;
 
   @override
   DiagnosticType get type => DiagnosticType.STATIC_WARNING;
diff --git a/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart b/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart
@@ -262,7 +262,7 @@ class PubspecWarningCode extends ErrorCode {
        );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.WARNING;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.WARNING;
 
   @override
   DiagnosticType get type => DiagnosticType.STATIC_WARNING;
diff --git a/pkg/analyzer/test/generated/all_the_rest_test.dart b/pkg/analyzer/test/generated/all_the_rest_test.dart
@@ -77,64 +77,64 @@ class DartUriResolverTest extends _SimpleDartSdkTest {
 class ErrorSeverityTest {
   test_max_error_error() async {
     expect(
-      ErrorSeverity.ERROR.max(ErrorSeverity.ERROR),
-      same(ErrorSeverity.ERROR),
+      DiagnosticSeverity.ERROR.max(DiagnosticSeverity.ERROR),
+      same(DiagnosticSeverity.ERROR),
     );
   }
 
   test_max_error_none() async {
     expect(
-      ErrorSeverity.ERROR.max(ErrorSeverity.NONE),
-      same(ErrorSeverity.ERROR),
+      DiagnosticSeverity.ERROR.max(DiagnosticSeverity.NONE),
+      same(DiagnosticSeverity.ERROR),
     );
   }
 
   test_max_error_warning() async {
     expect(
-      ErrorSeverity.ERROR.max(ErrorSeverity.WARNING),
-      same(ErrorSeverity.ERROR),
+      DiagnosticSeverity.ERROR.max(DiagnosticSeverity.WARNING),
+      same(DiagnosticSeverity.ERROR),
     );
   }
 
   test_max_none_error() async {
     expect(
-      ErrorSeverity.NONE.max(ErrorSeverity.ERROR),
-      same(ErrorSeverity.ERROR),
+      DiagnosticSeverity.NONE.max(DiagnosticSeverity.ERROR),
+      same(DiagnosticSeverity.ERROR),
     );
   }
 
   test_max_none_none() async {
     expect(
-      ErrorSeverity.NONE.max(ErrorSeverity.NONE),
-      same(ErrorSeverity.NONE),
+      DiagnosticSeverity.NONE.max(DiagnosticSeverity.NONE),
+      same(DiagnosticSeverity.NONE),
     );
   }
 
   test_max_none_warning() async {
     expect(
-      ErrorSeverity.NONE.max(ErrorSeverity.WARNING),
-      same(ErrorSeverity.WARNING),
+      DiagnosticSeverity.NONE.max(DiagnosticSeverity.WARNING),
+      same(DiagnosticSeverity.WARNING),
     );
   }
 
   test_max_warning_error() async {
     expect(
-      ErrorSeverity.WARNING.max(ErrorSeverity.ERROR),
-      same(ErrorSeverity.ERROR),
+      DiagnosticSeverity.WARNING.max(DiagnosticSeverity.ERROR),
+      same(DiagnosticSeverity.ERROR),
     );
   }
 
   test_max_warning_none() async {
     expect(
-      ErrorSeverity.WARNING.max(ErrorSeverity.NONE),
-      same(ErrorSeverity.WARNING),
+      DiagnosticSeverity.WARNING.max(DiagnosticSeverity.NONE),
+      same(DiagnosticSeverity.WARNING),
     );
   }
 
   test_max_warning_warning() async {
     expect(
-      ErrorSeverity.WARNING.max(ErrorSeverity.WARNING),
-      same(ErrorSeverity.WARNING),
+      DiagnosticSeverity.WARNING.max(DiagnosticSeverity.WARNING),
+      same(DiagnosticSeverity.WARNING),
     );
   }
 }
diff --git a/pkg/analyzer/test/generated/test_support.dart b/pkg/analyzer/test/generated/test_support.dart
@@ -396,11 +396,11 @@ class GatheringErrorListener implements AnalysisErrorListener {
   /// number of [expectedSeverities] and that there are the same number of
   /// errors and warnings as specified by the argument. The order in which the
   /// errors were gathered is ignored.
-  void assertErrorsWithSeverities(List<ErrorSeverity> expectedSeverities) {
+  void assertErrorsWithSeverities(List<DiagnosticSeverity> expectedSeverities) {
     int expectedErrorCount = 0;
     int expectedWarningCount = 0;
-    for (ErrorSeverity severity in expectedSeverities) {
-      if (severity == ErrorSeverity.ERROR) {
+    for (DiagnosticSeverity severity in expectedSeverities) {
+      if (severity == DiagnosticSeverity.ERROR) {
         expectedErrorCount++;
       } else {
         expectedWarningCount++;
@@ -409,7 +409,7 @@ class GatheringErrorListener implements AnalysisErrorListener {
     int actualErrorCount = 0;
     int actualWarningCount = 0;
     for (AnalysisError error in _errors) {
-      if (error.errorCode.errorSeverity == ErrorSeverity.ERROR) {
+      if (error.errorCode.errorSeverity == DiagnosticSeverity.ERROR) {
         actualErrorCount++;
       } else {
         actualWarningCount++;
diff --git a/pkg/analyzer/test/source/error_processor_test.dart b/pkg/analyzer/test/source/error_processor_test.dart
@@ -81,7 +81,7 @@ analyzer:
 ''');
       expect(
         context.getProcessor(invalid_assignment)!.severity,
-        ErrorSeverity.ERROR,
+        DiagnosticSeverity.ERROR,
       );
       expect(
         context.getProcessor(assignment_of_do_not_store)!.severity,
@@ -127,7 +127,7 @@ analyzer:
         var unusedLocalProcessor = errorConfig.processors.firstWhere(
           (p) => p.appliesTo(unused_local_variable),
         );
-        expect(unusedLocalProcessor.severity, ErrorSeverity.ERROR);
+        expect(unusedLocalProcessor.severity, DiagnosticSeverity.ERROR);
 
         // skip
         var invalidAssignmentProcessor = errorConfig.processors
@@ -154,7 +154,7 @@ analyzer:
         var unusedLocalProcessor = errorConfig.processors.firstWhere(
           (p) => p.appliesTo(unused_local_variable),
         );
-        expect(unusedLocalProcessor.severity, ErrorSeverity.ERROR);
+        expect(unusedLocalProcessor.severity, DiagnosticSeverity.ERROR);
 
         // skip
         var invalidAssignmentProcessor = errorConfig.processors
@@ -174,7 +174,7 @@ analyzer:
 
       ErrorProcessor processor = errorConfig.processors.first;
       expect(processor.appliesTo(annotate_overrides), true);
-      expect(processor.severity, ErrorSeverity.WARNING);
+      expect(processor.severity, DiagnosticSeverity.WARNING);
     });
   });
 }
diff --git a/pkg/analyzer/test/src/options/analysis_options_test.dart b/pkg/analyzer/test/src/options/analysis_options_test.dart
@@ -142,7 +142,7 @@ analyzer:
 
     var processor = processors.first;
     expect(processor.appliesTo(warning), isTrue);
-    expect(processor.severity, ErrorSeverity.ERROR);
+    expect(processor.severity, DiagnosticSeverity.ERROR);
   }
 
   test_analyzer_errors_severityIsIgnore() {
diff --git a/pkg/analyzer/test/src/options/options_provider_test.dart b/pkg/analyzer/test/src/options/options_provider_test.dart
@@ -109,10 +109,10 @@ analyzer:
       options.errorProcessors,
       unorderedMatches([
         ErrorProcessorMatcher(
-          ErrorProcessor('toplevelerror', ErrorSeverity.WARNING),
+          ErrorProcessor('toplevelerror', DiagnosticSeverity.WARNING),
         ),
         ErrorProcessorMatcher(
-          ErrorProcessor('lowlevelerror', ErrorSeverity.WARNING),
+          ErrorProcessor('lowlevelerror', DiagnosticSeverity.WARNING),
         ),
       ]),
     );
@@ -139,7 +139,9 @@ include: second_options.yaml
     expect(
       options.errorProcessors,
       contains(
-        ErrorProcessorMatcher(ErrorProcessor('error_1', ErrorSeverity.ERROR)),
+        ErrorProcessorMatcher(
+          ErrorProcessor('error_1', DiagnosticSeverity.ERROR),
+        ),
       ),
     );
   }
@@ -166,8 +168,12 @@ include:
     expect(
       options.errorProcessors,
       unorderedMatches([
-        ErrorProcessorMatcher(ErrorProcessor('error_1', ErrorSeverity.ERROR)),
-        ErrorProcessorMatcher(ErrorProcessor('error_2', ErrorSeverity.WARNING)),
+        ErrorProcessorMatcher(
+          ErrorProcessor('error_1', DiagnosticSeverity.ERROR),
+        ),
+        ErrorProcessorMatcher(
+          ErrorProcessor('error_2', DiagnosticSeverity.WARNING),
+        ),
       ]),
     );
   }
@@ -194,7 +200,9 @@ analyzer:
         // We want to explicitly state the expected severity.
         // ignore: avoid_redundant_argument_values
         ErrorProcessorMatcher(ErrorProcessor('error_1', null)),
-        ErrorProcessorMatcher(ErrorProcessor('error_2', ErrorSeverity.WARNING)),
+        ErrorProcessorMatcher(
+          ErrorProcessor('error_2', DiagnosticSeverity.WARNING),
+        ),
       ]),
     );
   }
@@ -226,7 +234,9 @@ include:
         // We want to explicitly state the expected severity.
         // ignore: avoid_redundant_argument_values
         ErrorProcessorMatcher(ErrorProcessor('error_1', null)),
-        ErrorProcessorMatcher(ErrorProcessor('error_2', ErrorSeverity.WARNING)),
+        ErrorProcessorMatcher(
+          ErrorProcessor('error_2', DiagnosticSeverity.WARNING),
+        ),
       ]),
     );
   }
diff --git a/pkg/analyzer/tool/messages/error_code_info.dart b/pkg/analyzer/tool/messages/error_code_info.dart
@@ -442,7 +442,7 @@ class ErrorClassInfo {
     if (severity == null) {
       return '$typeCode.severity';
     } else {
-      return 'ErrorSeverity.$severity';
+      return 'DiagnosticSeverity.$severity';
     }
   }
 
diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart
@@ -168,7 +168,7 @@ library;
       out.writeln();
       out.writeln('@override');
       out.writeln(
-        'ErrorSeverity get errorSeverity => '
+        'DiagnosticSeverity get errorSeverity => '
         '${errorClass.severityCode};',
       );
       out.writeln();
diff --git a/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart b/pkg/analyzer_plugin/lib/utilities/analyzer_converter.dart
diff --git a/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart b/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
diff --git a/pkg/linter/test/mocks.dart b/pkg/linter/test/mocks.dart

Original file line number	Diff line number	Diff line change
`@@ -2337,7 +2337,7 @@ class AnalysisDriver {`
`2337`	`2337`	`) {`
`2338`	`2338`	`for (var error in errors) {`
`2339`	`2339`	`var severity = error.errorCode.errorSeverity;`
`2340`		`- if (severity == ErrorSeverity.ERROR) {`
	`2340`	`+ if (severity == DiagnosticSeverity.ERROR) {`
`2341`	`2341`	`file.hasErrorOrWarning = true;`
`2342`	`2342`	`return;`
`2343`	`2343`	`}`