From 2e2c22007130388a4a619f8c08eef2e9bc230c18 Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Mon, 24 May 2021 15:18:24 -0700
Subject: [PATCH] use 'flutter pub get' for both dart and flutter packages

---
 script/tool/lib/src/analyze_command.dart | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/script/tool/lib/src/analyze_command.dart b/script/tool/lib/src/analyze_command.dart
index 2892db90bbf6..b36c43e6b968 100644
--- a/script/tool/lib/src/analyze_command.dart
+++ b/script/tool/lib/src/analyze_command.dart
@@ -63,14 +63,10 @@ class AnalyzeCommand extends PluginCommand {
       throw ToolExit(1);
     }
 
-    await for (final Directory package in getPackages()) {
-      if (isFlutterPackage(package, fileSystem)) {
-        await processRunner.runAndStream('flutter', <String>['packages', 'get'],
-            workingDir: package, exitOnError: true);
-      } else {
-        await processRunner.runAndStream('dart', <String>['pub', 'get'],
-            workingDir: package, exitOnError: true);
-      }
+    final List<Directory> packageDirectories = await getPackages().toList();
+    for (final Directory package in packageDirectories) {
+      await processRunner.runAndStream('flutter', <String>['packages', 'get'],
+          workingDir: package, exitOnError: true);
     }
 
     // Use the Dart SDK override if one was passed in.
@@ -79,7 +75,8 @@ class AnalyzeCommand extends PluginCommand {
         dartSdk == null ? 'dart' : p.join(dartSdk, 'bin', 'dart');
 
     final List<String> failingPackages = <String>[];
-    await for (final Directory package in getPlugins()) {
+    final List<Directory> pluginDirectories = await getPlugins().toList();
+    for (final Directory package in pluginDirectories) {
       final int exitCode = await processRunner.runAndStream(
           dartBinary, <String>['analyze', '--fatal-infos'],
           workingDir: package);