Version 2.19.0-31.0.dev

Merge commit '56dc3e360ac07e9a7a1d952f2e576c73e0f4d92e' into 'dev'

Author: Dart CI

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

@@ -6,6 +6,7 @@ import 'package:analysis_server/src/services/correction/dart/abstract_producer.d
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -37,6 +38,7 @@ class ConvertToContains extends CorrectionProducer {
         return;
       }
       var methodName = leftOperand.methodName;
+      var startArgumentRange = _startArgumentRange(leftOperand);
       var deletionRange = range.endEnd(leftOperand, rightOperand);
       var notOffset = -1;
       var style = _negationStyle(comparison.operator.type, value);
@@ -51,6 +53,9 @@ class ConvertToContains extends CorrectionProducer {
           builder.addSimpleInsertion(notOffset, '!');
         }
         builder.addSimpleReplacement(range.node(methodName), 'contains');
+        if (startArgumentRange != null) {
+          builder.addDeletion(startArgumentRange);
+        }
         builder.addDeletion(deletionRange);
       });
     } else if (_isInteger(leftOperand) && rightOperand is MethodInvocation) {
@@ -59,6 +64,7 @@ class ConvertToContains extends CorrectionProducer {
         return;
       }
       var methodName = rightOperand.methodName;
+      var startArgumentRange = _startArgumentRange(rightOperand);
       var deletionRange = range.startStart(leftOperand, rightOperand);
       var notOffset = -1;
       var style =
@@ -75,6 +81,9 @@ class ConvertToContains extends CorrectionProducer {
           builder.addSimpleInsertion(notOffset, '!');
         }
         builder.addSimpleReplacement(range.node(methodName), 'contains');
+        if (startArgumentRange != null) {
+          builder.addDeletion(startArgumentRange);
+        }
       });
     }
   }
@@ -156,6 +165,16 @@ class ConvertToContains extends CorrectionProducer {
     // so we should never reach this point.
     return NegationStyle.none;
   }
+
+  SourceRange? _startArgumentRange(MethodInvocation invocation) {
+    var arguments = invocation.argumentList.arguments;
+    if (arguments.length == 2) {
+      var firstArgument = arguments[0];
+      var secondArgument = arguments[1];
+      return range.endEnd(firstArgument, secondArgument);
+    }
+    return null;
+  }
 }
 
 /// An indication of whether the `contains` test should be negated, not negated,

pkg/analysis_server/test/src/services/correction/fix/convert_to_contains_test.dart

@@ -240,6 +240,32 @@ bool f(List<int> list, int value) {
 bool f(List<int> list, int value) {
   return !list.contains(value);
 }
+''');
+  }
+
+  Future<void> test_twoArguments_left() async {
+    await resolveTestCode('''
+bool f(List<int> list, int value) {
+  return list.indexOf(value, 0) >= 0;
+}
+''');
+    await assertHasFix('''
+bool f(List<int> list, int value) {
+  return list.contains(value);
+}
+''');
+  }
+
+  Future<void> test_twoArguments_right() async {
+    await resolveTestCode('''
+bool f(List<int> list, int value) {
+  return 0 <= list.indexOf(value, 0);
+}
+''');
+    await assertHasFix('''
+bool f(List<int> list, int value) {
+  return list.contains(value);
+}
 ''');
   }
 }

pkg/analyzer/lib/src/test_utilities/mock_sdk.dart

@@ -467,7 +467,7 @@ class List<E> implements Iterable<E> {
   void addAll(Iterable<E> iterable) {}
   Map<int, E> asMap() => throw 0;
   void clear() {}
-  int indexOf(Object element);
+  int indexOf(E element, [int start = 0]);
   bool remove(Object? value);
   E removeLast() => throw 0;
 

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 30
+PRERELEASE 31
 PRERELEASE_PATCH 0