DAS: Use Diagnostic in place of deprecated AnalysisError

Work towards #60635

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

Author: srawlins

pkg/analysis_server/lib/src/cider/fixes.dart

@@ -7,7 +7,7 @@ import 'package:analysis_server_plugin/edit/fix/fix.dart';
 import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
 import 'package:analysis_server_plugin/src/correction/fix_processor.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/instrumentation/service.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
@@ -16,15 +16,15 @@ import 'package:analyzer/src/dart/micro/resolve_file.dart';
 import 'package:analyzer/src/services/top_level_declarations.dart';
 
 class CiderErrorFixes {
-  final AnalysisError error;
+  final Diagnostic diagnostic;
 
-  /// The fixes for the [error], might be empty.
+  /// The fixes for the [diagnostic], might be empty.
   final List<Fix> fixes;
 
   final LineInfo lineInfo;
 
   CiderErrorFixes({
-    required this.error,
+    required this.diagnostic,
     required this.fixes,
     required this.lineInfo,
   });
@@ -61,7 +61,11 @@ class CiderFixesComputer {
           fixes.sort(Fix.compareFixes);
 
           result.add(
-            CiderErrorFixes(error: error, fixes: fixes, lineInfo: lineInfo),
+            CiderErrorFixes(
+              diagnostic: error,
+              fixes: fixes,
+              lineInfo: lineInfo,
+            ),
           );
         }
       }

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

@@ -10,6 +10,7 @@ import 'package:analysis_server_plugin/src/correction/fix_in_file_processor.dart
 import 'package:analysis_server_plugin/src/correction/fix_processor.dart';
 import 'package:analysis_server_plugin/src/correction/ignore_diagnostic.dart';
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/overlay_file_system.dart';
@@ -71,7 +72,7 @@ class LintFixTester {
 
     var unitResult = resolvedLibrary.unitWithPath(path)!;
 
-    AnalysisError error;
+    Diagnostic diagnostic;
     var errors = unitResult.errors;
     if (inFile) {
       var groups = errors.groupListsBy((error) => error.errorCode);
@@ -81,15 +82,15 @@ class LintFixTester {
           '\n$errors\n${groups.keys.toList()}',
         );
       }
-      error = errors.first;
+      diagnostic = errors.first;
     } else {
       if (errors.length != 1) {
         throw StateError('Exactly one lint expected: $errors');
       }
-      error = errors.single;
+      diagnostic = errors.single;
     }
 
-    if (error.errorCode is! LintCode) {
+    if (diagnostic.errorCode is! LintCode) {
       throw StateError('A lint expected: $errors');
     }
 
@@ -99,7 +100,7 @@ class LintFixTester {
       workspace: workspace,
       libraryResult: resolvedLibrary,
       unitResult: unitResult,
-      error: error,
+      error: diagnostic,
     );
 
     List<Fix> fixes;

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

@@ -7,7 +7,7 @@ import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/analysis/experiments.dart';
@@ -33,7 +33,7 @@ String format(String content, {Version? languageVersion}) {
 
 /// Returns a [ParseStringResult]. If successful, the result contains the sorted
 /// code. On failure, the result contains the unsorted original code, and the
-/// cause of the failure, a list of [AnalysisError]'s.
+/// cause of the failure, a list of [Diagnostic]s.
 ParseStringResult sortDirectives(String contents, {String? fileName}) {
   var (unit, errors) = _parse(contents, fullName: fileName);
   var parseErrors =
@@ -52,7 +52,7 @@ ParseStringResult sortDirectives(String contents, {String? fileName}) {
   return ParseStringResultImpl(sorter.code, unit, parseErrors);
 }
 
-(CompilationUnit, List<AnalysisError>) _parse(
+(CompilationUnit, List<Diagnostic>) _parse(
   String contents, {
   String? fullName,
 }) {

pkg/analysis_server/lib/src/handler/legacy/legacy_handler.dart

@@ -10,7 +10,7 @@ import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/legacy_analysis_server.dart';
 import 'package:analysis_server/src/protocol/protocol_internal.dart';
 import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/dart/error/syntactic_errors.g.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
 import 'package:analyzer/src/utilities/cancellation.dart';
@@ -79,10 +79,10 @@ abstract class LegacyHandler {
   /// Handle the [request].
   Future<void> handle();
 
-  /// Return the number of syntactic errors in the list of [errors].
-  int numberOfSyntacticErrors(List<AnalysisError> errors) {
+  /// Return the number of syntactic errors in the list of [diagnostics].
+  int numberOfSyntacticErrors(List<Diagnostic> diagnostics) {
     var numScanParseErrors = 0;
-    for (var error in errors) {
+    for (var error in diagnostics) {
       if (error.errorCode is ScannerErrorCode ||
           error.errorCode is ParserErrorCode) {
         numScanParseErrors++;

pkg/analysis_server/lib/src/lsp/handlers/code_actions/abstract_code_actions_producer.dart

@@ -13,7 +13,7 @@ import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/request_handler_mixin.dart';
 import 'package:analyzer/dart/analysis/analysis_options.dart';
 import 'package:analyzer/dart/analysis/session.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart' as engine;
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/analysis/results.dart' as engine;
@@ -90,17 +90,17 @@ abstract class AbstractCodeActionsProducer
     );
   }
 
-  /// Create an LSP [Diagnostic] for [error].
+  /// Create an LSP [Diagnostic] for [diagnostic].
   @protected
   Diagnostic createDiagnostic(
     LineInfo lineInfo,
     engine.ErrorsResultImpl result,
-    AnalysisError error,
+    engine.Diagnostic diagnostic,
   ) {
     return pluginToDiagnostic(
       server.uriConverter,
       (_) => lineInfo,
-      protocol.newAnalysisError_fromEngine(result, error),
+      protocol.newAnalysisError_fromEngine(result, diagnostic),
       supportedTags: supportedDiagnosticTags,
       clientSupportsCodeDescription: supportsCodeDescription,
     );
@@ -157,7 +157,7 @@ abstract class AbstractCodeActionsProducer
   engine.ErrorsResultImpl createResult(
     AnalysisSession session,
     LineInfo lineInfo,
-    List<AnalysisError> errors,
+    List<engine.Diagnostic> diagnostics,
   ) {
     return engine.ErrorsResultImpl(
       session: session,
@@ -167,7 +167,7 @@ abstract class AbstractCodeActionsProducer
       lineInfo: lineInfo,
       isLibrary: true,
       isPart: false,
-      errors: errors,
+      errors: diagnostics,
       analysisOptions: analysisOptions,
     );
   }

pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart

@@ -10,7 +10,7 @@ import 'package:analysis_server/src/lsp/handlers/handlers.dart';
 import 'package:analysis_server/src/lsp/mapping.dart';
 import 'package:analysis_server/src/lsp/source_edits.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/error/error.dart' as engine;
+import 'package:analyzer/diagnostic/diagnostic.dart' as engine;
 import 'package:analyzer/src/dart/scanner/scanner.dart' as engine;
 import 'package:analyzer/src/generated/parser.dart' as engine;
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -21,8 +21,8 @@ abstract class SimpleEditCommandHandler<S extends AnalysisServer>
 
   String get commandName;
 
-  bool hasScanParseErrors(List<engine.AnalysisError> errors) {
-    return errors.any(
+  bool hasScanParseErrors(List<engine.Diagnostic> diagnostics) {
+    return diagnostics.any(
       (error) =>
           error.errorCode is engine.ScannerErrorCode ||
           error.errorCode is engine.ParserErrorCode,

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

@@ -25,6 +25,7 @@ import 'package:analysis_server/src/services/snippets/snippet.dart';
 import 'package:analysis_server/src/utilities/extensions/string.dart';
 import 'package:analyzer/dart/analysis/results.dart' as server;
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart' as server;
 import 'package:analyzer/error/error.dart' as server;
 import 'package:analyzer/source/line_info.dart' as server;
 import 'package:analyzer/source/line_info.dart';
@@ -1375,14 +1376,14 @@ lsp.CompletionItem toCompletionItem(
 lsp.Diagnostic toDiagnostic(
   ClientUriConverter uriConverter,
   server.ResolvedUnitResult result,
-  server.AnalysisError error, {
+  server.Diagnostic diagnostic, {
   required Set<lsp.DiagnosticTag> supportedTags,
   required bool clientSupportsCodeDescription,
 }) {
   return pluginToDiagnostic(
     uriConverter,
     (_) => result.lineInfo,
-    server.newAnalysisError_fromEngine(result, error),
+    server.newAnalysisError_fromEngine(result, diagnostic),
     supportedTags: supportedTags,
     clientSupportsCodeDescription: clientSupportsCodeDescription,
   );

pkg/analysis_server/lib/src/protocol_server.dart

@@ -108,28 +108,28 @@ String? getReturnTypeString(engine.Element element) {
 /// Translates engine errors through the ErrorProcessor.
 List<T> mapEngineErrors<T>(
   engine.AnalysisResultWithErrors result,
-  List<engine.AnalysisError> errors,
+  List<engine.Diagnostic> diagnostics,
   T Function(
     engine.AnalysisResultWithErrors result,
-    engine.AnalysisError error, [
+    engine.Diagnostic diagnostic, [
     engine.ErrorSeverity errorSeverity,
   ])
   constructor,
 ) {
   var analysisOptions = result.session.analysisContext
       .getAnalysisOptionsForFile(result.file);
   var serverErrors = <T>[];
-  for (var error in errors) {
-    var processor = ErrorProcessor.getProcessor(analysisOptions, error);
+  for (var diagnostic in diagnostics) {
+    var processor = ErrorProcessor.getProcessor(analysisOptions, diagnostic);
     if (processor != null) {
       var severity = processor.severity;
       // Errors with null severity are filtered out.
       if (severity != null) {
         // Specified severities override.
-        serverErrors.add(constructor(result, error, severity));
+        serverErrors.add(constructor(result, diagnostic, severity));
       }
     } else {
-      serverErrors.add(constructor(result, error));
+      serverErrors.add(constructor(result, diagnostic));
     }
   }
   return serverErrors;
@@ -140,7 +140,7 @@ List<T> mapEngineErrors<T>(
 /// If an [errorSeverity] is specified, it will override the one in [error].
 AnalysisError newAnalysisError_fromEngine(
   engine.AnalysisResultWithErrors result,
-  engine.AnalysisError error, [
+  engine.Diagnostic error, [
   engine.ErrorSeverity? errorSeverity,
 ]) {
   var errorCode = error.errorCode;

pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart

@@ -15,7 +15,7 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart' as engine;
+import 'package:analyzer/diagnostic/diagnostic.dart' as engine;
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/source/source.dart';
@@ -146,7 +146,7 @@ class StatementCompletionProcessor {
   // have to test.
   StatementCompletion? completion;
   SourceChange change = SourceChange('statement-completion');
-  List<engine.AnalysisError> errors = [];
+  List<engine.Diagnostic> diagnostics = [];
   final Map<String, LinkedEditGroup> linkedPositionGroups =
       <String, LinkedEditGroup>{};
   Position? exitPosition;
@@ -190,14 +190,14 @@ class StatementCompletionProcessor {
     for (var error in statementContext.resolveResult.errors) {
       if (error.offset >= node.offset && error.offset <= node.end) {
         if (error.errorCode is! HintCode && error.errorCode is! WarningCode) {
-          errors.add(error);
+          diagnostics.add(error);
         }
       }
     }
 
     _checkExpressions(node);
     if (node is Statement) {
-      if (errors.isEmpty) {
+      if (diagnostics.isEmpty) {
         if (_complete_ifStatement(node) ||
             _complete_forStatement2(node) ||
             _complete_whileStatement(node) ||
@@ -219,7 +219,7 @@ class StatementCompletionProcessor {
         }
       }
     } else if (node is Declaration) {
-      if (errors.isNotEmpty) {
+      if (diagnostics.isNotEmpty) {
         if (_complete_classDeclaration(node) ||
             _complete_variableDeclaration(node) ||
             _complete_simpleSemicolon(node) ||
@@ -401,7 +401,7 @@ class StatementCompletionProcessor {
     if (node is! ClassDeclaration) {
       return false;
     }
-    if (node.leftBracket.isSynthetic && errors.length == 1) {
+    if (node.leftBracket.isSynthetic && diagnostics.length == 1) {
       // The space before the left brace is assumed to exist, even if it does not.
       var sb = SourceBuilder(file, node.end - 1);
       sb.append(' ');
@@ -434,7 +434,7 @@ class StatementCompletionProcessor {
     }
     var previousInsertions = _lengthOfInsertions();
     var delta = 0;
-    if (errors.isNotEmpty) {
+    if (diagnostics.isNotEmpty) {
       var error = _findError(
         ParserErrorCode.EXPECTED_TOKEN,
         partialMatch: "';'",
@@ -724,7 +724,7 @@ class StatementCompletionProcessor {
     } else if (body is Block) {
       if (body.rightBracket.end <= selectionOffset) {
         // emptyInitializersAfterBody
-        errors = []; // Ignore errors; they are for previous statement.
+        diagnostics = []; // Ignore errors; they are for previous statement.
         return false; // If cursor is after closing brace just add newline.
       }
     }
@@ -965,7 +965,7 @@ class StatementCompletionProcessor {
 
   bool _complete_simpleEnter() {
     int offset;
-    if (errors.isNotEmpty) {
+    if (diagnostics.isNotEmpty) {
       offset = selectionOffset;
     } else {
       var indent = utils.getLinePrefix(selectionOffset);
@@ -978,7 +978,7 @@ class StatementCompletionProcessor {
   }
 
   bool _complete_simpleSemicolon(AstNode node) {
-    if (errors.length != 1) {
+    if (diagnostics.length != 1) {
       return false;
     }
     var error = _findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "';'");
@@ -1170,11 +1170,8 @@ class StatementCompletionProcessor {
     );
   }
 
-  engine.AnalysisError? _findError(
-    DiagnosticCode code, {
-    Pattern? partialMatch,
-  }) {
-    return errors.firstWhereOrNull(
+  engine.Diagnostic? _findError(DiagnosticCode code, {Pattern? partialMatch}) {
+    return diagnostics.firstWhereOrNull(
       (err) =>
           err.errorCode == code &&
           (partialMatch == null ? true : err.message.contains(partialMatch)),
@@ -1279,7 +1276,7 @@ class StatementCompletionProcessor {
   void _removeError(DiagnosticCode diagnosticCode, {Pattern? partialMatch}) {
     var error = _findError(diagnosticCode, partialMatch: partialMatch);
     if (error != null) {
-      errors.remove(error);
+      diagnostics.remove(error);
     }
   }