analyzer: Rename "error" variables to be "diagnostics"

This is cleanup from renaming types like `DiagnosticCode`. I found these
variables which also need to be renamed.

Change-Id: I0e6d0633009c9c2b5d719f4c911295f9ded4e257
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/468160
Auto-Submit: Samuel Rawlins <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: srawlins

pkg/analyzer/lib/src/analysis_options/options_file_validator.dart

@@ -33,7 +33,7 @@ List<Diagnostic> analyzeAnalysisOptions(
   VersionConstraint? sdkVersionConstraint,
   ResourceProvider resourceProvider,
 ) {
-  List<Diagnostic> errors = [];
+  List<Diagnostic> diagnostics = [];
   Source initialSource = source;
   SourceSpan? initialIncludeSpan;
   AnalysisOptionsProvider optionsProvider = AnalysisOptionsProvider(
@@ -46,21 +46,21 @@ List<Diagnostic> analyzeAnalysisOptions(
   // functions, and should be refactored to a class maintaining state, with less
   // variable shadowing.
   void addDirectErrorOrIncludedError(
-    List<Diagnostic> validationErrors,
+    List<Diagnostic> validationDiagnostics,
     Source source, {
     required bool isSourcePrimary,
   }) {
     if (!isSourcePrimary) {
-      // [source] is an included file, and we should only report errors in
+      // [source] is an included file, and we should only report diagnostics in
       // [initialSource], noting that the included file has warnings.
-      for (Diagnostic error in validationErrors) {
+      for (Diagnostic diagnostic in validationDiagnostics) {
         var args = [
           source.fullName,
-          error.offset.toString(),
-          (error.offset + error.length - 1).toString(),
-          error.message,
+          diagnostic.offset.toString(),
+          (diagnostic.offset + diagnostic.length - 1).toString(),
+          diagnostic.message,
         ];
-        errors.add(
+        diagnostics.add(
           Diagnostic.tmp(
             source: initialSource,
             offset: initialIncludeSpan!.start.offset,
@@ -71,9 +71,9 @@ List<Diagnostic> analyzeAnalysisOptions(
         );
       }
     } else {
-      // [source] is the options file for [contextRoot]. Report all errors
+      // [source] is the options file for [contextRoot]. Report all diagnostics
       // directly.
-      errors.addAll(validationErrors);
+      diagnostics.addAll(validationDiagnostics);
     }
   }
 
@@ -123,7 +123,7 @@ List<Diagnostic> analyzeAnalysisOptions(
 
       var includedSource = sourceFactory.resolveUri(source, includeUri);
       if (includedSource == initialSource) {
-        errors.add(
+        diagnostics.add(
           Diagnostic.tmp(
             source: initialSource,
             offset: initialIncludeSpan!.start.offset,
@@ -135,7 +135,7 @@ List<Diagnostic> analyzeAnalysisOptions(
         return;
       }
       if (includedSource == null || !includedSource.exists()) {
-        errors.add(
+        diagnostics.add(
           Diagnostic.tmp(
             source: initialSource,
             offset: initialIncludeSpan!.start.offset,
@@ -148,7 +148,7 @@ List<Diagnostic> analyzeAnalysisOptions(
       }
       var spanInChain = includeChain[includedSource];
       if (spanInChain != null) {
-        errors.add(
+        diagnostics.add(
           Diagnostic.tmp(
             source: initialSource,
             offset: initialIncludeSpan!.start.offset,
@@ -190,9 +190,9 @@ List<Diagnostic> analyzeAnalysisOptions(
           e.span!.end.offset.toString(),
           e.message,
         ];
-        // Report errors for included option files on the `include` directive
+        // Report diagnostics for included option files on the `include` directive
         // located in the initial options file.
-        errors.add(
+        diagnostics.add(
           Diagnostic.tmp(
             source: initialSource,
             offset: initialIncludeSpan!.start.offset,
@@ -227,7 +227,7 @@ List<Diagnostic> analyzeAnalysisOptions(
     validate(source, options, contextRoot: contextRoot);
   } on OptionsFormatException catch (e) {
     SourceSpan span = e.span!;
-    errors.add(
+    diagnostics.add(
       Diagnostic.tmp(
         source: source,
         offset: span.start.offset,
@@ -237,7 +237,7 @@ List<Diagnostic> analyzeAnalysisOptions(
       ),
     );
   }
-  return errors;
+  return diagnostics;
 }
 
 /// Returns the name of the first legacy plugin, if one is specified in

pkg/analyzer/lib/src/dart/constant/constant_verifier.dart

@@ -1270,31 +1270,31 @@ class _ConstLiteralVerifier {
     if (notPotentiallyConstants.isEmpty) return true;
 
     for (var notConst in notPotentiallyConstants) {
-      DiagnosticCode errorCode;
+      DiagnosticCode diagnosticCode;
       if (listElementType != null) {
-        errorCode = diag.nonConstantListElement;
+        diagnosticCode = diag.nonConstantListElement;
       } else if (mapConfig != null) {
-        errorCode = diag.nonConstantMapElement;
+        diagnosticCode = diag.nonConstantMapElement;
         for (
           AstNode? parent = notConst;
           parent != null;
           parent = parent.parent
         ) {
           if (parent is MapLiteralEntry) {
             if (parent.key == notConst) {
-              errorCode = diag.nonConstantMapKey;
+              diagnosticCode = diag.nonConstantMapKey;
             } else {
-              errorCode = diag.nonConstantMapValue;
+              diagnosticCode = diag.nonConstantMapValue;
             }
             break;
           }
         }
       } else if (setConfig != null) {
-        errorCode = diag.nonConstantSetElement;
+        diagnosticCode = diag.nonConstantSetElement;
       } else {
         throw UnimplementedError();
       }
-      verifier._diagnosticReporter.atNode(notConst, errorCode);
+      verifier._diagnosticReporter.atNode(notConst, diagnosticCode);
     }
 
     return false;

pkg/analyzer/lib/src/dart/resolver/binary_expression_resolver.dart

@@ -146,14 +146,14 @@ class BinaryExpressionResolver {
     );
 
     void reportNullComparison(SyntacticEntity start, SyntacticEntity end) {
-      var errorCode = notEqual
+      var diagnosticCode = notEqual
           ? diag.unnecessaryNullComparisonAlwaysNullFalse
           : diag.unnecessaryNullComparisonAlwaysNullTrue;
       var offset = start.offset;
       _diagnosticReporter.atOffset(
         offset: offset,
         length: end.end - offset,
-        diagnosticCode: errorCode,
+        diagnosticCode: diagnosticCode,
       );
     }
 

pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart

@@ -92,22 +92,22 @@ class FunctionReferenceResolver {
     TypeArgumentList typeArgumentList,
     String? name,
     List<TypeParameterElement> typeParameters,
-    DiagnosticCode errorCode,
+    DiagnosticCode diagnosticCode,
   ) {
     if (typeArgumentList.arguments.length != typeParameters.length) {
       if (name == null &&
-          errorCode == diag.wrongNumberOfTypeArgumentsFunction) {
-        errorCode = diag.wrongNumberOfTypeArgumentsAnonymousFunction;
+          diagnosticCode == diag.wrongNumberOfTypeArgumentsFunction) {
+        diagnosticCode = diag.wrongNumberOfTypeArgumentsAnonymousFunction;
         _diagnosticReporter.atNode(
           typeArgumentList,
-          errorCode,
+          diagnosticCode,
           arguments: [typeParameters.length, typeArgumentList.arguments.length],
         );
       } else {
         assert(name != null);
         _diagnosticReporter.atNode(
           typeArgumentList,
-          errorCode,
+          diagnosticCode,
           arguments: [
             name!,
             typeParameters.length,

pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart

@@ -125,27 +125,27 @@ class TypePropertyResolver {
         }
       }
 
-      DiagnosticCode errorCode;
+      DiagnosticCode diagnosticCode;
       List<String> arguments;
       if (parentNode == null) {
-        errorCode = diag.uncheckedInvocationOfNullableValue;
+        diagnosticCode = diag.uncheckedInvocationOfNullableValue;
         arguments = [];
       } else {
         if (parentNode is CascadeExpression) {
           parentNode = parentNode.cascadeSections.first;
         }
         if (parentNode is BinaryExpression || parentNode is RelationalPattern) {
-          errorCode = diag.uncheckedOperatorInvocationOfNullableValue;
+          diagnosticCode = diag.uncheckedOperatorInvocationOfNullableValue;
           arguments = [name];
         } else if (parentNode is MethodInvocation ||
             parentNode is MethodReferenceExpression) {
-          errorCode = diag.uncheckedMethodInvocationOfNullableValue;
+          diagnosticCode = diag.uncheckedMethodInvocationOfNullableValue;
           arguments = [name];
         } else if (parentNode is FunctionExpressionInvocation) {
-          errorCode = diag.uncheckedInvocationOfNullableValue;
+          diagnosticCode = diag.uncheckedInvocationOfNullableValue;
           arguments = [];
         } else {
-          errorCode = diag.uncheckedPropertyAccessOfNullableValue;
+          diagnosticCode = diag.uncheckedPropertyAccessOfNullableValue;
           arguments = [name];
         }
       }
@@ -169,7 +169,7 @@ class TypePropertyResolver {
         }
       }
       _resolver.nullableDereferenceVerifier.report(
-        errorCode,
+        diagnosticCode,
         propertyErrorEntity,
         receiverType,
         arguments: arguments,

pkg/analyzer/lib/src/dart/scanner/scanner.dart

@@ -64,8 +64,8 @@ class Scanner {
 
   /// Initialize a newly created scanner to scan characters from the given
   /// [source]. The given character [reader] will be used to read the characters
-  /// in the source. The given [_diagnosticListener] will be informed of any errors
-  /// that are found.
+  /// in the source. The given [_diagnosticListener] will be informed of any
+  /// errors that are found.
   factory Scanner(
     Source source,
     CharacterReader reader,
@@ -128,7 +128,7 @@ class Scanner {
   }
 
   void reportError(
-    DiagnosticCode errorCode,
+    DiagnosticCode diagnosticCode,
     int offset,
     List<Object?>? arguments,
   ) {
@@ -137,7 +137,7 @@ class Scanner {
         source: source,
         offset: offset,
         length: 1,
-        diagnosticCode: errorCode,
+        diagnosticCode: diagnosticCode,
         arguments: arguments ?? const [],
       ),
     );

pkg/analyzer/lib/src/dart/scanner/translate_error_token.dart

@@ -16,15 +16,15 @@ void translateErrorToken(ErrorToken token, ReportError reportError) {
   int charOffset = token.charOffset;
   // TODO(paulberry): why is endOffset sometimes null?
   int endOffset = token.endOffset ?? charOffset;
-  void makeError(DiagnosticCode errorCode, List<Object>? arguments) {
+  void makeError(DiagnosticCode code, List<Object>? arguments) {
     if (_isAtEnd(token, charOffset)) {
       // Analyzer never generates an error message past the end of the input,
       // since such an error would not be visible in an editor.
       // TODO(paulberry): would it make sense to replicate this behavior
       // in cfe, or move it elsewhere in analyzer?
       charOffset--;
     }
-    reportError(errorCode, charOffset, arguments);
+    reportError(code, charOffset, arguments);
   }
 
   Code errorCode = token.errorCode;
@@ -111,11 +111,11 @@ bool _isAtEnd(Token token, int charOffset) {
 }
 
 /// Used to report a scan error at the given offset.
-/// The [errorCode] is the error code indicating the nature of the error.
+/// The [diagnosticCode] is the error code indicating the nature of the error.
 /// The [arguments] are any arguments needed to complete the error message.
 typedef ReportError =
     void Function(
-      DiagnosticCode errorCode,
+      DiagnosticCode diagnosticCode,
       int offset,
       List<Object>? arguments,
     );