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 <[email protected]>
Auto-Submit: Keerti Parthasarathy <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: keertip

pkg/dartdev/lib/src/analysis_server.dart

@@ -199,10 +199,12 @@ class AnalysisServer {
   }
 
   Future<EditBulkFixesResult> requestBulkFixes(
-      String filePath, bool inTestMode, List<String> codes) {
+      String filePath, bool inTestMode, List<String> codes,
+      {bool updatePubspec = false}) {
     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(
@@ -212,13 +214,18 @@ class AnalysisServer {
 
   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

@@ -151,6 +151,15 @@ To use the tool, run either ['dart fix --dry-run'] for a preview of the proposed
         // 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);
     }