DAS: Consolidate containsAny helper

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

Author: srawlins

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

@@ -7,6 +7,7 @@ import 'dart:collection';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/correction/namespace.dart';
 import 'package:analysis_server/src/utilities/extensions/element.dart';
+import 'package:analysis_server/src/utilities/extensions/iterable.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart';
 import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
@@ -1228,9 +1229,3 @@ extension on SimpleIdentifier {
     return null;
   }
 }
-
-extension<T> on Iterable<T> {
-  bool containsAny(Iterable<T> values) {
-    return values.any((v) => contains(v));
-  }
-}

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

@@ -6,6 +6,7 @@ import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/correction/selection_analyzer.dart';
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/correction/util.dart';
+import 'package:analysis_server/src/utilities/extensions/iterable.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
@@ -95,8 +96,7 @@ class StatementAnalyzer extends SelectionAnalyzer {
   @override
   void visitDoStatement(DoStatement node) {
     super.visitDoStatement(node);
-    var selectedNodes = this.selectedNodes;
-    if (_contains(selectedNodes, node.body)) {
+    if (selectedNodes.contains(node.body)) {
       invalidSelection(
         "Operation not applicable to a 'do' statement's body and expression.",
       );
@@ -111,17 +111,17 @@ class StatementAnalyzer extends SelectionAnalyzer {
       var selectedNodes = this.selectedNodes;
       bool containsInit;
       if (forLoopParts is ForPartsWithExpression) {
-        containsInit = _contains(selectedNodes, forLoopParts.initialization);
+        containsInit = selectedNodes.contains(forLoopParts.initialization);
       } else if (forLoopParts is ForPartsWithDeclarations) {
-        containsInit = _contains(selectedNodes, forLoopParts.variables);
+        containsInit = selectedNodes.contains(forLoopParts.variables);
       } else if (forLoopParts is ForPartsWithPattern) {
-        containsInit = _contains(selectedNodes, forLoopParts.variables);
+        containsInit = selectedNodes.contains(forLoopParts.variables);
       } else {
         throw StateError('Unrecognized for loop parts');
       }
-      var containsCondition = _contains(selectedNodes, forLoopParts.condition);
-      var containsUpdaters = _containsAny(selectedNodes, forLoopParts.updaters);
-      var containsBody = _contains(selectedNodes, node.body);
+      var containsCondition = selectedNodes.contains(forLoopParts.condition);
+      var containsUpdaters = selectedNodes.containsAny(forLoopParts.updaters);
+      var containsBody = selectedNodes.contains(node.body);
       if (containsInit && containsCondition) {
         invalidSelection(
           "Operation not applicable to a 'for' statement's initializer and condition.",
@@ -181,9 +181,8 @@ class StatementAnalyzer extends SelectionAnalyzer {
   @override
   void visitWhileStatement(WhileStatement node) {
     super.visitWhileStatement(node);
-    var selectedNodes = this.selectedNodes;
-    if (_contains(selectedNodes, node.condition) &&
-        _contains(selectedNodes, node.body)) {
+    if (selectedNodes.contains(node.condition) &&
+        selectedNodes.contains(node.body)) {
       invalidSelection(
         "Operation not applicable to a while statement's expression and body.",
       );
@@ -231,20 +230,6 @@ class StatementAnalyzer extends SelectionAnalyzer {
     var rangeText = fullText.substring(range.offset, range.end);
     return _getTokens(rangeText, resolveResult.unit.featureSet).isNotEmpty;
   }
-
-  /// Returns `true` if [nodes] contains [node].
-  static bool _contains(List<AstNode> nodes, AstNode? node) =>
-      nodes.contains(node);
-
-  /// Returns `true` if [nodes] contains one of the [otherNodes].
-  static bool _containsAny(List<AstNode> nodes, List<AstNode> otherNodes) {
-    for (var otherNode in otherNodes) {
-      if (nodes.contains(otherNode)) {
-        return true;
-      }
-    }
-    return false;
-  }
 }
 
 class _SourceMock implements Source {

pkg/analysis_server/lib/src/utilities/extensions/iterable.dart

@@ -0,0 +1,8 @@
+// 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.
+
+extension IterableExtension<T> on Iterable<T> {
+  /// Whether this Iterable contains any of [values].
+  bool containsAny(Iterable<T> values) => values.any((v) => contains(v));
+}