Fix for pubspec edits when removing a line between entries.

Change-Id: Ie4a74e70f836b8f20631d2cd1cac8c962554d3d3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/362840 Commit-Queue: Keerti Parthasarathy <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
dart-lang · Apr 15, 2024 · 0199e9d · 0199e9d
1 parent e067bf7
commit 0199e9d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_generator.dart
@@ -202,13 +202,14 @@ class PubspecFixGenerator {
         // Go through entries and remove each one.
         for (var dep in removeDevDeps) {
           MapEntry<dynamic, YamlNode>? currentEntry, nextEntry, prevEntry;
-          for (var entry in section.nodes.entries) {
+          var length = section.nodes.entries.length;
+          for (int i = 0; i < length; i++) {
+            var entry = section.nodes.entries.elementAt(i);
             if (entry.key.value == dep) {
               currentEntry = entry;
-              continue;
-            }
-            if (currentEntry != null) {
-              nextEntry = entry;
+              if (i + 1 < length) {
+                nextEntry = section.nodes.entries.elementAt(i + 1);
+              }
               break;
             }
             prevEntry = entry;
@@ -240,7 +241,17 @@ class PubspecFixGenerator {
             var endOffset = nextEntry == null
                 ? currentEntry.value.span.end.offset
                 : (nextEntry.key as YamlNode).span.start.offset;
-
+            // If entry in the middle of two other entries that are not to be
+            // removed, delete the line.
+            if (prevEntry != null &&
+                nextEntry != null &&
+                !removeDevDeps.contains(prevEntry.key.value) &&
+                !removeDevDeps.contains(nextEntry.key.value)) {
+              var line = (currentEntry.key as YamlNode).span.start.line;
+              startOffset = lineInfo.lineStarts[line];
+              var nextLine = (nextEntry.key as YamlNode).span.start.line;
+              endOffset = lineInfo.lineStarts[nextLine];
+            }
             if (edit == null) {
               edit = _Range(startOffset, endOffset);
             } else if (edit.endOffset > startOffset) {

diff --git a/pkg/analysis_server/test/src/services/correction/fix/bulk_fix_processor_test.dart b/pkg/analysis_server/test/src/services/correction/fix/bulk_fix_processor_test.dart
@@ -149,9 +149,6 @@ void bad() {
 
 @reflectiveTest
 class PubspecFixTest extends BulkFixProcessorTest {
-  @FailingTest(
-      reason: 'TODO(keertip: Fix issue with deletes where the entry to'
-          'be removed is in between entries.')
   Future<void> test_delete_change() async {
     var content = '''
 name: test