analyzer: Deduplicate some code around lists of diagnostics into shared helpers

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

Author: srawlins

pkg/analysis_server/test/src/computer/color_computer_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:analysis_server/src/computer/computer_color.dart';
 import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -196,10 +196,7 @@ class ColorComputerTest extends AbstractContextTest {
 
   void expectNoErrors(ResolvedUnitResult result) {
     // If the test code has errors, generate a suitable failure to help debug.
-    var errors =
-        result.diagnostics
-            .where((error) => error.severity == Severity.error)
-            .toList();
+    var errors = result.diagnostics.errors;
     if (errors.isNotEmpty) {
       throw 'Code has errors: $errors\n\n${result.content}';
     }

pkg/analysis_server/tool/code_completion/code_metrics.dart

@@ -10,9 +10,9 @@ 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/ast/visitor.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:args/args.dart';
 
 /// Compute and print lexical and semantic information about a package.
@@ -1309,7 +1309,7 @@ class CodeShapeMetricsComputer {
             print('File $filePath skipped because it could not be analyzed.');
             print('');
             continue;
-          } else if (hasError(resolvedUnitResult)) {
+          } else if (resolvedUnitResult.diagnostics.errors.isNotEmpty) {
             print('File $filePath skipped due to errors:');
             for (var diagnostic in resolvedUnitResult.diagnostics) {
               print('  ${diagnostic.toString()}');
@@ -1418,14 +1418,4 @@ class CodeShapeMetricsComputer {
       }
     }
   }
-
-  /// Whether the [result] contains an error.
-  static bool hasError(ResolvedUnitResult result) {
-    for (var diagnostic in result.diagnostics) {
-      if (diagnostic.severity == Severity.error) {
-        return true;
-      }
-    }
-    return false;
-  }
 }

pkg/analysis_server/tool/code_completion/completion_metrics_base.dart

@@ -8,11 +8,11 @@ import 'dart:math' as math;
 import 'package:analyzer/dart/analysis/analysis_context.dart';
 import 'package:analyzer/dart/analysis/context_root.dart';
 import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/overlay_file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:args/args.dart';
 import 'package:cli_util/cli_logging.dart';
 
@@ -131,7 +131,7 @@ abstract class CompletionMetricsComputer {
               await context.currentSession.getResolvedUnit(filePath)
                   as ResolvedUnitResult;
 
-          var analysisError = getFirstErrorOrNull(result);
+          var analysisError = result.diagnostics.errors.firstOrNull;
           if (analysisError != null) {
             progress.clear();
             print('File $filePath skipped due to errors such as:');
@@ -157,19 +157,6 @@ abstract class CompletionMetricsComputer {
   /// Performs setup tasks with [context] before resolution.
   void setupForResolution(AnalysisContext context);
 
-  /// Given some [ResolvedUnitResult] returns the first error of high severity
-  /// if such an error exists, `null` otherwise.
-  static Diagnostic? getFirstErrorOrNull(
-    ResolvedUnitResult resolvedUnitResult,
-  ) {
-    for (var diagnostic in resolvedUnitResult.diagnostics) {
-      if (diagnostic.severity == Severity.error) {
-        return diagnostic;
-      }
-    }
-    return null;
-  }
-
   /// Gets overlay content for [content], applying a change at
   /// [expectedCompletion] with [prefixLength], according to [overlay], one of
   /// the [CompletionMetricsOptions].

pkg/analysis_server/tool/code_completion/flutter_metrics.dart

@@ -9,9 +9,9 @@ import 'package:analyzer/dart/analysis/context_root.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
 import 'package:args/args.dart';
 
@@ -207,7 +207,7 @@ class FlutterMetricsComputer {
             print('');
             print('File $filePath skipped because it could not be analyzed.');
             continue;
-          } else if (hasError(resolvedUnitResult)) {
+          } else if (resolvedUnitResult.diagnostics.errors.isNotEmpty) {
             print('');
             print('File $filePath skipped due to errors:');
             for (var diagnostic in resolvedUnitResult.diagnostics) {
@@ -289,14 +289,4 @@ class FlutterMetricsComputer {
       sink.writeln('  $percent%: ${entry.key} (${entry.value})');
     }
   }
-
-  /// Whether the [result] contains an error.
-  static bool hasError(ResolvedUnitResult result) {
-    for (var diagnostic in result.diagnostics) {
-      if (diagnostic.severity == Severity.error) {
-        return true;
-      }
-    }
-    return false;
-  }
 }

pkg/analysis_server/tool/code_completion/implicit_type_declarations.dart

@@ -11,9 +11,9 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:args/args.dart';
 
 /// Compute metrics to determine which untyped variable declarations can be used
@@ -193,12 +193,10 @@ class ImpliedTypeComputer {
               print('');
             }
             continue;
-          } else if (hasError(resolvedUnitResult)) {
+          } else if (resolvedUnitResult.diagnostics.errors.isNotEmpty) {
             if (verbose) {
               print('File $filePath skipped due to errors:');
-              for (var diagnostics in resolvedUnitResult.diagnostics.where(
-                (e) => e.severity == Severity.error,
-              )) {
+              for (var diagnostics in resolvedUnitResult.diagnostics.errors) {
                 print('  ${diagnostics.toString()}');
               }
               print('');
@@ -217,16 +215,6 @@ class ImpliedTypeComputer {
       }
     }
   }
-
-  /// Return `true` if the [result] contains an error.
-  static bool hasError(ResolvedUnitResult result) {
-    for (var diagnostic in result.diagnostics) {
-      if (diagnostic.severity == Severity.error) {
-        return true;
-      }
-    }
-    return false;
-  }
 }
 
 class ImpliedTypeData {

pkg/analysis_server/tool/code_completion/relevance_metrics.dart

@@ -27,10 +27,10 @@ import 'package:analyzer/dart/element/element.dart'
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/dart/element/type_system.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
 import 'package:args/args.dart';
 
@@ -2220,12 +2220,10 @@ class RelevanceMetricsComputer {
               print('');
             }
             continue;
-          } else if (hasError(resolvedUnitResult)) {
+          } else if (resolvedUnitResult.diagnostics.errors.isNotEmpty) {
             if (verbose) {
               print('File $filePath skipped due to errors:');
-              for (var diagnostic in resolvedUnitResult.diagnostics.where(
-                (e) => e.severity == Severity.error,
-              )) {
+              for (var diagnostic in resolvedUnitResult.diagnostics.errors) {
                 print('  ${diagnostic.toString()}');
               }
               print('');
@@ -2454,16 +2452,6 @@ class RelevanceMetricsComputer {
     var table = _convertColumnsToRows([firstColumn, secondColumn]).toList();
     sink.writeTable(table);
   }
-
-  /// Whether the [result] contains an error.
-  static bool hasError(ResolvedUnitResult result) {
-    for (var diagnostic in result.diagnostics) {
-      if (diagnostic.severity == Severity.error) {
-        return true;
-      }
-    }
-    return false;
-  }
 }
 
 /// Information collected to compute a percentage of data points that were

pkg/analysis_server/tool/code_completion/relevance_table_generator.dart

@@ -18,10 +18,10 @@ import 'package:analyzer/dart/element/element.dart'
     show Element, InterfaceElement, LibraryElement;
 import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/dart/element/type_system.dart';
-import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
 import 'package:analyzer_testing/package_root.dart' as package_root;
 import 'package:analyzer_utilities/tools.dart';
@@ -1683,12 +1683,10 @@ class RelevanceMetricsComputer {
               print('');
             }
             continue;
-          } else if (hasError(resolvedUnitResult)) {
+          } else if (resolvedUnitResult.diagnostics.errors.isNotEmpty) {
             if (verbose) {
               print('File $filePath skipped due to errors:');
-              for (var diagnostic in resolvedUnitResult.diagnostics.where(
-                (e) => e.severity == Severity.error,
-              )) {
+              for (var diagnostic in resolvedUnitResult.diagnostics.errors) {
                 print('  ${diagnostic.toString()}');
               }
               print('');
@@ -1708,16 +1706,6 @@ class RelevanceMetricsComputer {
       }
     }
   }
-
-  /// Return `true` if the [result] contains an error.
-  static bool hasError(ResolvedUnitResult result) {
-    for (var diagnostic in result.diagnostics) {
-      if (diagnostic.severity == Severity.error) {
-        return true;
-      }
-    }
-    return false;
-  }
 }
 
 /// A class used to write relevance data as a set of tables in a generated Dart

pkg/analyzer/lib/src/utilities/extensions/diagnostic.dart

@@ -0,0 +1,10 @@
+// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:analyzer/diagnostic/diagnostic.dart';
+
+extension ListOfDiagnosticExtension on List<Diagnostic> {
+  /// The diagnostics in this list with [Severity.error].
+  Iterable<Diagnostic> get errors => where((d) => d.severity == Severity.error);
+}

pkg/analyzer/test/util/id_testing_helper.dart

@@ -19,6 +19,7 @@ import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/src/dart/analysis/testing_data.dart';
 import 'package:analyzer/src/test_utilities/mock_sdk.dart';
+import 'package:analyzer/src/utilities/extensions/diagnostic.dart';
 import 'package:analyzer_testing/utilities/extensions/resource_provider.dart';
 
 /// Test configuration used for testing the analyzer without experiments.
@@ -163,8 +164,7 @@ Future<TestResult<T>> runTestForConfig<T>(
     var testUri = testFile.uri;
     var result = await analysisSession.getResolvedUnit(testFile.path);
     result as ResolvedUnitResult;
-    var errors =
-        result.diagnostics.where((e) => e.severity == Severity.error).toList();
+    var errors = result.diagnostics.errors;
     if (errors.isNotEmpty) {
       if (dataComputer.supportsErrors) {
         var diagnosticMap = <int, List<Diagnostic>>{};