analyzer: Rename ErrorListener classes to DiagnosticListener

Work towards #60635

I tried to keep this minimal but still sensible:

* Rename AnalysisErrorListener and all subtypes to use 'Diagnostic'.
* Rename all instantiations of such classes if they previously
  contained the word 'error'.
* Rename `RecordingDiagnosticListener.errors` to `.diagnostics`.
* Rename some _testing_ instance members that had the word 'error'
  to instead use 'diagnostic'.

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

Author: srawlins

pkg/analysis_server/lib/src/context_manager.dart

@@ -473,14 +473,14 @@ class ContextManagerImpl implements ContextManager {
     var convertedErrors = const <protocol.AnalysisError>[];
     try {
       var content = file.readAsStringSync();
-      var errorListener = RecordingErrorListener();
-      var errorReporter = ErrorReporter(errorListener, FileSource(file));
+      var diagnosticListener = RecordingDiagnosticListener();
+      var errorReporter = ErrorReporter(diagnosticListener, FileSource(file));
       var parser = TransformSetParser(errorReporter, packageName);
       parser.parse(content);
       var converter = AnalyzerConverter();
       var analysisOptions = driver.getAnalysisOptionsForFile(file);
       convertedErrors = converter.convertAnalysisErrors(
-        errorListener.errors,
+        diagnosticListener.diagnostics,
         lineInfo: LineInfo.fromContent(content),
         options: analysisOptions,
       );

pkg/analysis_server/lib/src/g3/utilities.dart

@@ -57,13 +57,13 @@ ParseStringResult sortDirectives(String contents, {String? fileName}) {
   String? fullName,
 }) {
   var source = StringSource(contents, fullName);
-  var errorListener = RecordingErrorListener();
+  var diagnosticListener = RecordingDiagnosticListener();
   var reader = CharSequenceReader(contents);
   var featureSet = FeatureSet.fromEnableFlags2(
     sdkLanguageVersion: ExperimentStatus.currentVersion,
     flags: [],
   );
-  var scanner = Scanner(source, reader, errorListener)..configureFeatures(
+  var scanner = Scanner(source, reader, diagnosticListener)..configureFeatures(
     featureSetForOverriding: FeatureSet.latestLanguageVersion(),
     featureSet: featureSet,
   );
@@ -76,12 +76,12 @@ ParseStringResult sortDirectives(String contents, {String? fileName}) {
 
   var parser = p.Parser(
     source,
-    errorListener,
+    diagnosticListener,
     featureSet: scanner.featureSet,
     lineInfo: lineInfo,
     languageVersion: languageVersion,
   );
 
   var unit = parser.parseCompilationUnit(token);
-  return (unit, errorListener.errors);
+  return (unit, diagnosticListener.diagnostics);
 }

pkg/analysis_server/lib/src/lsp/source_edits.dart

@@ -678,7 +678,7 @@ class _MinimalEditComputer {
       var scanner = Scanner(
         _SourceMock.instance,
         CharSequenceReader(s),
-        AnalysisErrorListener.NULL_LISTENER,
+        DiagnosticListener.NULL_LISTENER,
       )..configureFeatures(
         featureSetForOverriding: featureSet,
         featureSet: featureSet,

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

@@ -273,12 +273,12 @@ class BulkFixProcessor {
           break;
         }
         if (parsedLibrary is ParsedLibraryResult) {
-          var errorListener = RecordingErrorListener();
+          var diagnosticListener = RecordingDiagnosticListener();
           var contextUnits = <RuleContextUnit>[];
 
           for (var parsedUnit in parsedLibrary.units) {
             var errorReporter = ErrorReporter(
-              errorListener,
+              diagnosticListener,
               StringSource(parsedUnit.content, null),
             );
             contextUnits.add(
@@ -295,7 +295,7 @@ class BulkFixProcessor {
           }
           await _fixErrorsInParsedLibrary(
             parsedLibrary,
-            errorListener.errors,
+            diagnosticListener.diagnostics,
             stopAfterFirst: false,
           );
           if (isCancelled) {

pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart

@@ -115,7 +115,7 @@ class TransformSetManager {
     try {
       var content = file.readAsStringSync();
       var parser = TransformSetParser(
-        ErrorReporter(AnalysisErrorListener.NULL_LISTENER, FileSource(file)),
+        ErrorReporter(DiagnosticListener.NULL_LISTENER, FileSource(file)),
         packageName,
       );
       return parser.parse(content);

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

@@ -26,7 +26,7 @@ List<Token> _getTokens(String text, FeatureSet featureSet) {
     var scanner = Scanner(
       _SourceMock.instance,
       CharSequenceReader(text),
-      AnalysisErrorListener.NULL_LISTENER,
+      DiagnosticListener.NULL_LISTENER,
     )..configureFeatures(
       featureSetForOverriding: featureSet,
       featureSet: featureSet,

pkg/analysis_server/test/services/linter/linter_test.dart

@@ -21,17 +21,17 @@ void main() {
 
 @reflectiveTest
 class LinterRuleOptionsValidatorTest {
-  late RecordingErrorListener recorder;
+  late RecordingDiagnosticListener recorder;
 
   late ErrorReporter reporter;
 
-  List<Diagnostic> get errors => recorder.errors;
+  List<Diagnostic> get diagnostics => recorder.diagnostics;
 
   LinterRuleOptionsValidator get validator => LinterRuleOptionsValidator();
 
   void setUp() {
     registerLintRules();
-    recorder = RecordingErrorListener();
+    recorder = RecordingDiagnosticListener();
     reporter = ErrorReporter(recorder, _TestSource());
   }
 
@@ -73,7 +73,7 @@ linter:
   void validate(String source, List<DiagnosticCode> expected) {
     var options = AnalysisOptionsProvider().getOptionsFromString(source);
     validator.validate(reporter, options);
-    expect(errors.map((e) => e.errorCode), unorderedEquals(expected));
+    expect(diagnostics.map((e) => e.errorCode), unorderedEquals(expected));
   }
 }
 

pkg/analysis_server/test/src/services/correction/fix/data_driven/code_fragment_parser_test.dart

@@ -28,30 +28,30 @@ abstract class AbstractCodeFragmentParserTest {
     String content,
     List<ExpectedError> expectedErrors,
   ) {
-    var errorListener = GatheringErrorListener();
-    var accessors = _parser(errorListener).parseAccessors(content, 0);
-    errorListener.assertErrors(expectedErrors);
+    var diagnosticListener = GatheringDiagnosticListener();
+    var accessors = _parser(diagnosticListener).parseAccessors(content, 0);
+    diagnosticListener.assertErrors(expectedErrors);
     return accessors;
   }
 
   List<Accessor> assertNoErrors(String content) {
-    var errorListener = GatheringErrorListener();
-    var accessors = _parser(errorListener).parseAccessors(content, 0)!;
-    errorListener.assertNoErrors();
+    var diagnosticListener = GatheringDiagnosticListener();
+    var accessors = _parser(diagnosticListener).parseAccessors(content, 0)!;
+    diagnosticListener.assertNoErrors();
     return accessors;
   }
 
   Expression assertNoErrorsInCondition(
     String content, {
     List<String>? variables,
   }) {
-    var errorListener = GatheringErrorListener();
+    var diagnosticListener = GatheringDiagnosticListener();
     var expression =
         _parser(
-          errorListener,
+          diagnosticListener,
           variables: variables,
         ).parseCondition(content, 0)!;
-    errorListener.assertNoErrors();
+    diagnosticListener.assertNoErrors();
     return expression;
   }
 
@@ -74,7 +74,7 @@ abstract class AbstractCodeFragmentParserTest {
   );
 
   CodeFragmentParser _parser(
-    GatheringErrorListener listener, {
+    GatheringDiagnosticListener listener, {
     List<String>? variables,
   }) {
     var errorReporter = ErrorReporter(listener, MockSource());

pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_parser_test_support.dart

@@ -12,20 +12,21 @@ import '../../../../../utils/test_support.dart';
 
 /// Utilities shared between tests of the [TransformSetParser].
 abstract class AbstractTransformSetParserTest {
-  /// The listener to which errors will be reported.
-  GatheringErrorListener errorListener = GatheringErrorListener();
+  /// The listener to which diagnostics are reported.
+  GatheringDiagnosticListener diagnosticListener =
+      GatheringDiagnosticListener();
 
   /// The result of parsing the test file's content.
   TransformSet? result;
 
   void assertErrors(String code, List<ExpectedError> expectedErrors) {
     parse(code);
-    errorListener.assertErrors(expectedErrors);
+    diagnosticListener.assertErrors(expectedErrors);
   }
 
   void assertNoErrors(String content) {
     parse(content);
-    errorListener.assertNoErrors();
+    diagnosticListener.assertNoErrors();
   }
 
   ExpectedError error(
@@ -47,7 +48,7 @@ abstract class AbstractTransformSetParserTest {
 
   void parse(String content) {
     var errorReporter = ErrorReporter(
-      errorListener,
+      diagnosticListener,
       MockSource(fullName: 'data.yaml'),
     );
     var parser = TransformSetParser(errorReporter, 'myPackage');

pkg/analysis_server/test/stress/replay/replay.dart

@@ -226,7 +226,7 @@ class Driver {
     var scanner = Scanner(
       _TestSource(),
       CharSequenceReader(text),
-      error.AnalysisErrorListener.NULL_LISTENER,
+      error.DiagnosticListener.NULL_LISTENER,
     )..configureFeatures(
       featureSetForOverriding: featureSet,
       featureSet: featureSet,