analyzer: Use DiagnosticSeverity in _fe_analyzer_shared and analyzer_cli

Work towards #60635

DiagnosticSeverity is the new name for ErrorSeverity.

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

Author: srawlins

pkg/_fe_analyzer_shared/lib/src/base/errors.dart

@@ -79,11 +79,11 @@ abstract class ErrorCode {
   /**
    * The severity of the error.
    */
-  ErrorSeverity get errorSeverity;
+  DiagnosticSeverity get errorSeverity;
 
   /// Whether a finding of this error is ignorable via comments such as
   /// `// ignore:` or `// ignore_for_file:`.
-  bool get isIgnorable => errorSeverity != ErrorSeverity.ERROR;
+  bool get isIgnorable => errorSeverity != DiagnosticSeverity.ERROR;
 
   /**
    * The template used to create the problem message to be displayed for this
@@ -165,14 +165,8 @@ class ErrorSeverity implements Comparable<ErrorSeverity> {
 
   static const List<ErrorSeverity> values = const [NONE, INFO, WARNING, ERROR];
 
-  /**
-   * The name of this error code.
-   */
   final String name;
 
-  /**
-   * The ordinal value of the error code.
-   */
   final int ordinal;
 
   /**
@@ -185,9 +179,6 @@ class ErrorSeverity implements Comparable<ErrorSeverity> {
    */
   final String displayName;
 
-  /**
-   * Initialize a newly created severity with the given names.
-   */
   const ErrorSeverity(
       this.name, this.ordinal, this.machineCode, this.displayName);
 
@@ -220,52 +211,52 @@ class DiagnosticType implements Comparable<DiagnosticType> {
    * Task (todo) comments in user code.
    */
   static const DiagnosticType TODO =
-      const DiagnosticType('TODO', 0, ErrorSeverity.INFO);
+      const DiagnosticType('TODO', 0, DiagnosticSeverity.INFO);
 
   /**
    * Extra analysis run over the code to follow best practices, which are not in
    * the Dart Language Specification.
    */
   static const DiagnosticType HINT =
-      const DiagnosticType('HINT', 1, ErrorSeverity.INFO);
+      const DiagnosticType('HINT', 1, DiagnosticSeverity.INFO);
 
   /**
    * Compile-time errors are errors that preclude execution. A compile time
    * error must be reported by a Dart compiler before the erroneous code is
    * executed.
    */
   static const DiagnosticType COMPILE_TIME_ERROR =
-      const DiagnosticType('COMPILE_TIME_ERROR', 2, ErrorSeverity.ERROR);
+      const DiagnosticType('COMPILE_TIME_ERROR', 2, DiagnosticSeverity.ERROR);
 
   /**
    * Checked mode compile-time errors are errors that preclude execution in
    * checked mode.
    */
   static const DiagnosticType CHECKED_MODE_COMPILE_TIME_ERROR =
       const DiagnosticType(
-          'CHECKED_MODE_COMPILE_TIME_ERROR', 3, ErrorSeverity.ERROR);
+          'CHECKED_MODE_COMPILE_TIME_ERROR', 3, DiagnosticSeverity.ERROR);
 
   /**
    * Static warnings are those warnings reported by the static checker. They
    * have no effect on execution. Static warnings must be provided by Dart
    * compilers used during development.
    */
   static const DiagnosticType STATIC_WARNING =
-      const DiagnosticType('STATIC_WARNING', 4, ErrorSeverity.WARNING);
+      const DiagnosticType('STATIC_WARNING', 4, DiagnosticSeverity.WARNING);
 
   /**
    * Syntactic errors are errors produced as a result of input that does not
    * conform to the grammar.
    */
   static const DiagnosticType SYNTACTIC_ERROR =
-      const DiagnosticType('SYNTACTIC_ERROR', 6, ErrorSeverity.ERROR);
+      const DiagnosticType('SYNTACTIC_ERROR', 6, DiagnosticSeverity.ERROR);
 
   /**
    * Lint warnings describe style and best practice recommendations that can be
    * used to formalize a project's style guidelines.
    */
   static const DiagnosticType LINT =
-      const DiagnosticType('LINT', 7, ErrorSeverity.INFO);
+      const DiagnosticType('LINT', 7, DiagnosticSeverity.INFO);
 
   static const List<DiagnosticType> values = const [
     TODO,
@@ -290,7 +281,7 @@ class DiagnosticType implements Comparable<DiagnosticType> {
   /**
    * The severity of this type of error.
    */
-  final ErrorSeverity severity;
+  final DiagnosticSeverity severity;
 
   /**
    * Initialize a newly created error type to have the given [name] and

pkg/_fe_analyzer_shared/lib/src/scanner/errors.dart

@@ -202,7 +202,7 @@ class ScannerErrorCode extends ErrorCode {
         );
 
   @override
-  ErrorSeverity get errorSeverity => ErrorSeverity.ERROR;
+  DiagnosticSeverity get errorSeverity => DiagnosticSeverity.ERROR;
 
   @override
   DiagnosticType get type => DiagnosticType.SYNTACTIC_ERROR;

pkg/analyzer_cli/lib/src/analyzer_impl.dart

@@ -99,22 +99,24 @@ class AnalyzerImpl {
     }
   }
 
-  /// Treats the [sourcePath] as the top level library and analyzes it using
-  /// the analysis engine. If [printMode] is `0`, then no error or performance
-  /// information is printed. If [printMode] is `1`, then errors will be printed.
-  /// If [printMode] is `2`, then performance information will be printed, and
-  /// it will be marked as being for a cold VM.
-  Future<ErrorSeverity> analyze(
+  /// Treats the [libraryFile] as the top level library and analyzes it using
+  /// the analysis engine.
+  ///
+  /// If [printMode] is `0`, then no diagnostic or performance information is
+  /// printed. If [printMode] is `1`, then diagnostics will be printed. If
+  /// [printMode] is `2`, then performance information will be printed, and it
+  /// will be marked as being for a cold VM.
+  Future<DiagnosticSeverity> analyze(
     ErrorFormatter formatter, {
     int printMode = 1,
   }) async {
     setupForAnalysis();
     return await _analyze(printMode, formatter);
   }
 
-  /// Returns the maximal [ErrorSeverity] of the recorded errors.
-  ErrorSeverity computeMaxErrorSeverity() {
-    var status = ErrorSeverity.NONE;
+  /// Returns the maximal [DiagnosticSeverity] of the recorded diagnostics.
+  DiagnosticSeverity computeMaxErrorSeverity() {
+    var status = DiagnosticSeverity.NONE;
     for (var result in errorsResults) {
       for (var error in result.errors) {
         if (_defaultSeverityProcessor(error) == null) {
@@ -153,7 +155,7 @@ class AnalyzerImpl {
     }
   }
 
-  Future<ErrorSeverity> _analyze(
+  Future<DiagnosticSeverity> _analyze(
     int printMode,
     ErrorFormatter formatter,
   ) async {
@@ -162,7 +164,7 @@ class AnalyzerImpl {
       var libraryPath = libraryFile.path;
       stderr.writeln('Only libraries can be analyzed.');
       stderr.writeln('$libraryPath is a part and cannot be analyzed.');
-      return ErrorSeverity.ERROR;
+      return DiagnosticSeverity.ERROR;
     }
 
     var libraryElement = await _resolveLibrary();
@@ -180,7 +182,7 @@ class AnalyzerImpl {
     return computeMaxErrorSeverity();
   }
 
-  ErrorSeverity? _defaultSeverityProcessor(AnalysisError error) =>
+  DiagnosticSeverity? _defaultSeverityProcessor(AnalysisError error) =>
       determineProcessedSeverity(error, options, analysisOptions);
 
   /// Returns true if we want to report diagnostics for this library.

pkg/analyzer_cli/lib/src/batch_mode.dart

@@ -7,7 +7,8 @@ import 'dart:io' show exitCode, stdin;
 
 import 'package:analyzer/error/error.dart';
 
-typedef BatchRunnerHandler = Future<ErrorSeverity> Function(List<String> args);
+typedef BatchRunnerHandler =
+    Future<DiagnosticSeverity> Function(List<String> args);
 
 /// Provides a framework to read command line options from stdin and feed them
 /// to a callback.
@@ -26,7 +27,7 @@ class BatchRunner {
     stopwatch.start();
     var testsFailed = 0;
     var totalTests = 0;
-    var batchResult = ErrorSeverity.NONE;
+    var batchResult = DiagnosticSeverity.NONE;
     // Read line from stdin.
     var cmdLine = stdin.transform(utf8.decoder).transform(LineSplitter());
     cmdLine.listen((String line) async {
@@ -49,7 +50,7 @@ class BatchRunner {
       try {
         totalTests++;
         var result = await handler(args);
-        var resultPass = result != ErrorSeverity.ERROR;
+        var resultPass = result != DiagnosticSeverity.ERROR;
         if (!resultPass) {
           testsFailed++;
         }

pkg/analyzer_cli/lib/src/driver.dart

@@ -111,7 +111,7 @@ class Driver implements CommandLineStarter {
     } else {
       var severity = await _analyzeAll(options);
       // Propagate issues to the exit code.
-      if (_shouldBeFatal(severity, options)) {
+      if (_shouldBeFatal(severity)) {
         io.exitCode = severity.ordinal;
       }
     }
@@ -154,7 +154,7 @@ class Driver implements CommandLineStarter {
   }
 
   /// Perform analysis according to the given [options].
-  Future<ErrorSeverity> _analyzeAll(CommandLineOptions options) async {
+  Future<DiagnosticSeverity> _analyzeAll(CommandLineOptions options) async {
     if (!options.jsonFormat && !options.machineFormat) {
       var fileNames =
           options.sourceFiles.map((String file) {
@@ -222,13 +222,13 @@ class Driver implements CommandLineStarter {
       );
     }
 
-    var allResult = ErrorSeverity.NONE;
+    var allResult = DiagnosticSeverity.NONE;
 
     void reportPartError(String partPath) {
       errorSink.writeln('$partPath is a part and cannot be analyzed.');
       errorSink.writeln('Please pass in a library that contains this part.');
-      io.exitCode = ErrorSeverity.ERROR.ordinal;
-      allResult = allResult.max(ErrorSeverity.ERROR);
+      io.exitCode = DiagnosticSeverity.ERROR.ordinal;
+      allResult = allResult.max(DiagnosticSeverity.ERROR);
     }
 
     var pathList = options.sourceFiles.map(normalizePath).toList();
@@ -253,8 +253,8 @@ class Driver implements CommandLineStarter {
       var files = _collectFiles(sourcePath);
       if (files.isEmpty) {
         errorSink.writeln('No dart files found at: $sourcePath');
-        io.exitCode = ErrorSeverity.ERROR.ordinal;
-        return ErrorSeverity.ERROR;
+        io.exitCode = DiagnosticSeverity.ERROR.ordinal;
+        return DiagnosticSeverity.ERROR;
       }
 
       for (var file in files) {
@@ -461,7 +461,7 @@ class Driver implements CommandLineStarter {
       path.split(relative).any((part) => part.startsWith('.'));
 
   /// Analyze a single source.
-  Future<ErrorSeverity> _runAnalyzer(
+  Future<DiagnosticSeverity> _runAnalyzer(
     FileState file,
     CommandLineOptions options,
     ErrorFormatter formatter,
@@ -482,16 +482,16 @@ class Driver implements CommandLineStarter {
     return analyzer.analyze(formatter);
   }
 
-  bool _shouldBeFatal(ErrorSeverity severity, CommandLineOptions options) =>
-      severity == ErrorSeverity.ERROR;
+  bool _shouldBeFatal(DiagnosticSeverity severity) =>
+      severity == DiagnosticSeverity.ERROR;
 
   void _verifyAnalysisOptionsFileExists(CommandLineOptions options) {
     var path = options.defaultAnalysisOptionsPath;
     if (path != null) {
       if (!resourceProvider.getFile(path).exists) {
         printAndFail(
           'Options file not found: $path',
-          exitCode: ErrorSeverity.ERROR.ordinal,
+          exitCode: DiagnosticSeverity.ERROR.ordinal,
         );
       }
     }

pkg/analyzer_cli/lib/src/error_formatter.dart

@@ -29,12 +29,12 @@ String _relative(String file) {
 }
 
 /// Returns the given error's severity.
-ErrorSeverity _severityIdentity(AnalysisError error) =>
+DiagnosticSeverity _severityIdentity(AnalysisError error) =>
     error.errorCode.errorSeverity;
 
 /// Returns desired severity for the given [error] (or `null` if it's to be
 /// suppressed).
-typedef SeverityProcessor = ErrorSeverity? Function(AnalysisError error);
+typedef SeverityProcessor = DiagnosticSeverity? Function(AnalysisError error);
 
 /// Analysis statistics counter.
 class AnalysisStats {
@@ -220,7 +220,7 @@ abstract class ErrorFormatter {
 
   /// Compute the severity for this [error] or `null` if this error should be
   /// filtered.
-  ErrorSeverity? _computeSeverity(AnalysisError error) =>
+  DiagnosticSeverity? _computeSeverity(AnalysisError error) =>
       _severityProcessor(error);
 }
 
@@ -299,7 +299,7 @@ class HumanErrorFormatter extends ErrorFormatter {
 
     // Get display name; translate INFOs into LINTS and HINTS.
     var errorType = severity.displayName;
-    if (severity == ErrorSeverity.INFO) {
+    if (severity == DiagnosticSeverity.INFO) {
       if (error.errorCode.type == DiagnosticType.HINT ||
           error.errorCode.type == DiagnosticType.LINT) {
         errorType = error.errorCode.type.displayName;
@@ -488,9 +488,9 @@ class MachineErrorFormatter extends ErrorFormatter {
 
     var severity = _severityProcessor(error);
 
-    if (severity == ErrorSeverity.ERROR) {
+    if (severity == DiagnosticSeverity.ERROR) {
       stats.errorCount++;
-    } else if (severity == ErrorSeverity.WARNING) {
+    } else if (severity == DiagnosticSeverity.WARNING) {
       stats.warnCount++;
     } else if (error.errorCode.type == DiagnosticType.HINT) {
       stats.hintCount++;

pkg/analyzer_cli/lib/src/error_severity.dart

@@ -8,10 +8,10 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer_cli/src/options.dart';
 
 /// Compute the severity of the error; however:
-/// - if [options.enableTypeChecks] is false, then de-escalate checked-mode
-///   compile time errors to a severity of [ErrorSeverity.INFO].
-/// - if [options.lintsAreFatal] is true, escalate lints to errors.
-ErrorSeverity? computeSeverity(
+/// - if `options.enableTypeChecks` is false, then de-escalate checked-mode
+///   compile time errors to a severity of [DiagnosticSeverity.INFO].
+/// - if `options.lintsAreFatal` is true, escalate lints to errors.
+DiagnosticSeverity? computeSeverity(
   AnalysisError error,
   CommandLineOptions commandLineOptions,
   AnalysisOptions analysisOptions,
@@ -27,15 +27,15 @@ ErrorSeverity? computeSeverity(
 
 /// Check various configuration options to get a desired severity for this
 /// [error] (or `null` if it's to be suppressed).
-ErrorSeverity? determineProcessedSeverity(
+DiagnosticSeverity? determineProcessedSeverity(
   AnalysisError error,
   CommandLineOptions commandLineOptions,
   AnalysisOptions analysisOptions,
 ) {
   var severity = computeSeverity(error, commandLineOptions, analysisOptions);
   // Skip TODOs categorically unless escalated to ERROR or HINT (#26215).
   if (error.errorCode.type == DiagnosticType.TODO &&
-      severity == ErrorSeverity.INFO) {
+      severity == DiagnosticSeverity.INFO) {
     return null;
   }
 

pkg/analyzer_cli/test/driver_test.dart

@@ -450,7 +450,7 @@ class OptionsTest extends BaseTest {
     );
     expect(
       processorFor(assignment_of_do_not_store).severity,
-      ErrorSeverity.ERROR,
+      DiagnosticSeverity.ERROR,
     );
     expect(
       bulletToDash(outSink),

pkg/analyzer_cli/test/mocks.dart

@@ -72,7 +72,7 @@ class MockErrorCode implements ErrorCode {
   DiagnosticType type;
 
   @override
-  ErrorSeverity errorSeverity;
+  DiagnosticSeverity errorSeverity;
 
   @override
   String name;