analysis_server: use new Diagnostic name over AnalysisError

Work towards #60635

Change-Id: I5cc0cc66afd3531271eb8dc337556505cb21c074
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/425962
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart

@@ -878,11 +878,10 @@ class BulkFixProcessor {
 
     var analysisOptions = errorsResult.session.analysisContext
         .getAnalysisOptionsForFile(errorsResult.file);
-    var filteredErrors = _filterDiagnostics(
+    return _filterDiagnostics(
       analysisOptions,
       errorsResult.errors,
-    );
-    return filteredErrors.any(_isFixableError);
+    ).any((d) => d.isFixable);
   }
 
   Future<BulkFixRequestResult> _organizeDirectives(
@@ -999,22 +998,6 @@ class BulkFixProcessor {
           BulkFixProcessor.nonLintMultiProducerMap.containsKey(diagnosticCode);
     });
   }
-
-  /// Returns whether [diagnostic] is something that might be fixable.
-  static bool _isFixableError(Diagnostic diagnostic) {
-    var errorCode = diagnostic.errorCode;
-
-    // Special cases that can be bulk fixed by this class but not by
-    // FixProcessor.
-    if (errorCode == WarningCode.DUPLICATE_IMPORT ||
-        errorCode == HintCode.UNNECESSARY_IMPORT ||
-        errorCode == WarningCode.UNUSED_IMPORT ||
-        (DirectivesOrdering.allCodes.contains(errorCode))) {
-      return true;
-    }
-
-    return _canBulkFix(errorCode);
-  }
 }
 
 class BulkFixRequestResult {
@@ -1149,6 +1132,22 @@ class _PubspecDeps {
   final Set<String> devPackages = <String>{};
 }
 
+extension on Diagnostic {
+  /// Returns whether this diagnostic is something that might be fixable.
+  bool get isFixable {
+    // Special cases that can be bulk fixed by this class but not by
+    // FixProcessor.
+    if (errorCode == WarningCode.DUPLICATE_IMPORT ||
+        errorCode == HintCode.UNNECESSARY_IMPORT ||
+        errorCode == WarningCode.UNUSED_IMPORT ||
+        (DirectivesOrdering.allCodes.contains(errorCode))) {
+      return true;
+    }
+
+    return BulkFixProcessor._canBulkFix(errorCode);
+  }
+}
+
 extension on int {
   String get isAre => this == 1 ? 'is' : 'are';
 }

pkg/analysis_server/lib/src/services/correction/dart/replace_boolean_with_bool.dart

@@ -4,7 +4,6 @@
 
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -24,13 +23,10 @@ class ReplaceBooleanWithBool extends ResolvedCorrectionProducer {
 
   @override
   Future<void> compute(ChangeBuilder builder) async {
-    var analysisError = diagnostic;
-    if (analysisError is! Diagnostic) {
-      return;
+    if (diagnostic case var diagnostic?) {
+      await builder.addDartFileEdit(file, (builder) {
+        builder.addSimpleReplacement(range.error(diagnostic), 'bool');
+      });
     }
-
-    await builder.addDartFileEdit(file, (builder) {
-      builder.addSimpleReplacement(range.error(analysisError), 'bool');
-    });
   }
 }

pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart

@@ -31,7 +31,7 @@ class PubspecFixGenerator {
   /// The resource provider used to access the file system.
   final ResourceProvider resourceProvider;
 
-  /// The error for which fixes are being generated.
+  /// The diagnostic for which fixes are being generated.
   final Diagnostic error;
 
   /// The offset of the [error] for which fixes are being generated.

pkg/analysis_server/test/services/correction/organize_directives_test.dart

@@ -19,7 +19,7 @@ void main() {
 
 @reflectiveTest
 class OrganizeDirectivesTest extends AbstractSingleUnitTest {
-  late List<Diagnostic> testErrors;
+  late List<Diagnostic> testDiagnostics;
 
   @override
   void setUp() {
@@ -996,7 +996,7 @@ class NonLibraryAnnotation {
     var organizer = ImportOrganizer(
       testCode,
       testUnit,
-      testErrors,
+      testDiagnostics,
       removeUnused: removeUnused,
     );
     var edits = organizer.organize();
@@ -1007,12 +1007,12 @@ class NonLibraryAnnotation {
   Future<void> _computeUnitAndErrors(String code) async {
     verifyNoTestUnitErrors = false;
     await resolveTestCode(code);
-    testErrors = testAnalysisResult.errors;
+    testDiagnostics = testAnalysisResult.errors;
   }
 
   Future<void> _parseUnitAndErrors(String code) async {
     verifyNoTestUnitErrors = false;
     await parseTestCode(code);
-    testErrors = testParsedResult.errors;
+    testDiagnostics = testParsedResult.errors;
   }
 }

pkg/analysis_server/test/src/services/correction/fix/add_missing_enum_like_case_clauses_test.dart

@@ -27,8 +27,8 @@ class AddMissingEnumLikeCaseClausesTest extends FixProcessorLintTest {
 
   bool Function(Diagnostic) get _filter {
     var hasError = false;
-    return (error) {
-      var errorCode = error.errorCode;
+    return (diagnostic) {
+      var errorCode = diagnostic.errorCode;
       if (!hasError && errorCode is LintCode && errorCode.name == lintCode) {
         hasError = true;
         return true;

pkg/analysis_server/test/src/services/correction/fix/add_missing_switch_cases_test.dart

@@ -366,9 +366,9 @@ class AddMissingSwitchCasesTest_SwitchStatement extends FixProcessorTest {
 
   bool Function(Diagnostic) get _filter {
     var hasError = false;
-    return (error) {
+    return (diagnostic) {
       if (!hasError &&
-          error.errorCode ==
+          diagnostic.errorCode ==
               CompileTimeErrorCode.NON_EXHAUSTIVE_SWITCH_STATEMENT) {
         hasError = true;
         return true;

pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart

@@ -596,8 +596,8 @@ abstract class FixProcessorTest extends BaseFixProcessorTest {
   }
 
   /// Computes fixes and verifies that there are [expectedNumberOfFixesForKind]
-  /// fixes for the given [diagnostic] of the appropriate kind, and that the messages
-  /// of the fixes are equal to [matchFixMessages].
+  /// fixes for the given [diagnostic] of the appropriate kind, and that the
+  /// messages of the fixes are equal to [matchFixMessages].
   Future<void> _assertHasFixes(
     Diagnostic diagnostic, {
     required int expectedNumberOfFixesForKind,

pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart

@@ -21,7 +21,7 @@ abstract class PubspecFixTest with ResourceProviderMixin {
   /// The result of parsing the [content].
   late YamlNode node;
 
-  /// The error to be fixed.
+  /// The diagnostic to be fixed.
   late Diagnostic diagnostic;
 
   /// Return the kind of fixes being tested by this test class.

pkg/analysis_server/test/src/services/correction/fix/remove_unused_element_test.dart

@@ -179,8 +179,8 @@ enum _MyEnum {A, B, C}
     await assertHasFix(
       r'''
 ''',
-      errorFilter: (error) {
-        return error.errorCode == WarningCode.UNUSED_ELEMENT;
+      errorFilter: (diagnostic) {
+        return diagnostic.errorCode == WarningCode.UNUSED_ELEMENT;
       },
     );
   }

pkg/analysis_server/test/utils/test_support.dart

@@ -269,21 +269,19 @@ class GatheringDiagnosticListener implements DiagnosticListener {
       }
       expectedCounts[code] = count;
     }
-    //
-    // Compute the actual number of each type of error.
-    //
-    var errorsByCode = <DiagnosticCode, List<Diagnostic>>{};
+
+    // Compute the actual number of each type of diagnostic.
+    var diagnosticsByCode = <DiagnosticCode, List<Diagnostic>>{};
     for (var diagnostic in _diagnostics) {
-      errorsByCode
+      diagnosticsByCode
           .putIfAbsent(diagnostic.errorCode, () => <Diagnostic>[])
           .add(diagnostic);
     }
-    //
-    // Compare the expected and actual number of each type of error.
-    //
+
+    // Compare the expected and actual number of each type of diagnostic.
     expectedCounts.forEach((DiagnosticCode code, int expectedCount) {
       int actualCount;
-      var list = errorsByCode.remove(code);
+      var list = diagnosticsByCode.remove(code);
       if (list == null) {
         actualCount = 0;
       } else {
@@ -306,8 +304,11 @@ class GatheringDiagnosticListener implements DiagnosticListener {
     // Check that there are no more errors in the actual-errors map,
     // otherwise record message.
     //
-    errorsByCode.forEach((code, actualErrors) {
-      var actualCount = actualErrors.length;
+    diagnosticsByCode.forEach((
+      DiagnosticCode code,
+      List<Diagnostic> actualDiagnostics,
+    ) {
+      var actualCount = actualDiagnostics.length;
       if (buffer.length == 0) {
         buffer.write('Expected ');
       } else {
@@ -318,8 +319,8 @@ class GatheringDiagnosticListener implements DiagnosticListener {
       buffer.write(', found ');
       buffer.write(actualCount);
       buffer.write(' (');
-      for (var i = 0; i < actualErrors.length; i++) {
-        var error = actualErrors[i];
+      for (var i = 0; i < actualDiagnostics.length; i++) {
+        var error = actualDiagnostics[i];
         if (i > 0) {
           buffer.write(', ');
         }