commit 7961fea00fe032e36a43b10c2e6dcd15a8e0bf0a
author Jackson Gardner <jacksongardner@google.com> Tue Nov 21 17:45:29 2023 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 21 17:45:29 2023 +0000
tree 2489d9c7a0b36f7e0fe1a2dbecc7b52d316c8804
parent 459f1adecc047ec984adb4809b8f30f864df2f68

Revert "Reland adding a pass to fix pubspec during dart fix runs"

This reverts commit 3c3dd78bc1fb10666bc8033c7affb04a3bfb8ed0.

Reason for revert: Causes a crash when analyzing flutter customer tests. See https://github.com/flutter/flutter/issues/138813

Original change's description:
> Reland adding a pass to fix pubspec during dart fix runs
>
> Change-Id: I48d2cd1e4023129e62ef371b452873a320ce0461
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337160
> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
> Auto-Submit: Keerti Parthasarathy <keertip@google.com>
> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>

Change-Id: I4056ef6ab6772ec6ee8eada9657bb6eacc0a1274
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337603
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Keerti Parthasarathy <keertip@google.com>
Reviewed-by: Keerti Parthasarathy <keertip@google.com>

pkg/dartdev/lib/src/analysis_server.dart

diff --git a/pkg/dartdev/lib/src/analysis_server.dart b/pkg/dartdev/lib/src/analysis_server.dart
index 1648f3f..5aac198 100644
--- a/pkg/dartdev/lib/src/analysis_server.dart
+++ b/pkg/dartdev/lib/src/analysis_server.dart
@@ -199,12 +199,10 @@
   }
 
   Future<EditBulkFixesResult> requestBulkFixes(
-      String filePath, bool inTestMode, List<String> codes,
-      {bool updatePubspec = false}) {
+      String filePath, bool inTestMode, List<String> codes) {
     return _sendCommand('edit.bulkFixes', params: <String, dynamic>{
       'included': [path.canonicalize(filePath)],
       'inTestMode': inTestMode,
-      'updatePubspec': updatePubspec,
       if (codes.isNotEmpty) 'codes': codes,
     }).then((result) {
       return EditBulkFixesResult.fromJson(
@@ -214,18 +212,13 @@
 
   Future<void> shutdown({Duration? timeout}) async {
     // Request shutdown.
-    final Future<void> future =
-        _sendCommand('server.shutdown').then((Map<String, dynamic> value) {
+    final Future<void> future = _sendCommand('server.shutdown').then((Map<String, dynamic> value) {
       _shutdownResponseReceived = true;
       return;
     });
-    await (timeout != null
-            ? future.timeout(timeout, onTimeout: () {
-                log.stderr(
-                    'The analysis server timed out while shutting down.');
-              })
-            : future)
-        .whenComplete(dispose);
+    await (timeout != null ? future.timeout(timeout, onTimeout: () {
+      log.stderr('The analysis server timed out while shutting down.');
+    }) : future).whenComplete(dispose);
   }
 
   /// Send an `analysis.updateContent` request with the given [files].

pkg/dartdev/lib/src/commands/fix.dart

diff --git a/pkg/dartdev/lib/src/commands/fix.dart b/pkg/dartdev/lib/src/commands/fix.dart
index 097e421..e262901 100644
--- a/pkg/dartdev/lib/src/commands/fix.dart
+++ b/pkg/dartdev/lib/src/commands/fix.dart
@@ -151,15 +151,6 @@
         // TODO(brianwilkerson) Be more intelligent about detecting infinite
         //  loops so that we can increase [maxPasses].
       } while (pass < maxPasses && edits.isNotEmpty);
-      // If there are no more dart edits, check if there are any changes
-      // to pubspec
-      if (edits.isEmpty && detailsMap.isNotEmpty) {
-        var fixes = await server.requestBulkFixes(fixPath, inTestMode, [],
-            updatePubspec: true);
-        _mergeDetails(detailsMap, fixes.details);
-        edits = fixes.edits;
-        _applyEdits(server, edits);
-      }
       return _FixRequestResult(details: detailsMap);
     }