From 41df811fbdee2762b4cd5d616b111375ec03aa58 Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Fri, 7 May 2021 14:10:03 -0400
Subject: [PATCH] Fix analyzer issues (#3863)

* Make infos fatal when analyzing packages
* Fix import ordering for updated analysis
---
 script/tool/lib/src/analyze_command.dart          | 3 ++-
 script/tool/lib/src/version_check_command.dart    | 2 +-
 script/tool/test/analyze_command_test.dart        | 9 ++++++---
 script/tool/test/publish_plugin_command_test.dart | 2 +-
 script/tool/test/util.dart                        | 2 +-
 script/tool/test/version_check_test.dart          | 4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/script/tool/lib/src/analyze_command.dart b/script/tool/lib/src/analyze_command.dart
index e17400fa88..61be5f98a6 100644
--- a/script/tool/lib/src/analyze_command.dart
+++ b/script/tool/lib/src/analyze_command.dart
@@ -70,7 +70,8 @@ class AnalyzeCommand extends PluginCommand {
     final List<String> failingPackages = <String>[];
     await for (final Directory package in getPlugins()) {
       final int exitCode = await processRunner.runAndStream(
-          'dart', <String>['analyze'], workingDir: package);
+          'dart', <String>['analyze', '--fatal-infos'],
+          workingDir: package);
       if (exitCode != 0) {
         failingPackages.add(p.basename(package.path));
       }
diff --git a/script/tool/lib/src/version_check_command.dart b/script/tool/lib/src/version_check_command.dart
index 39fecc0392..db69f4ead8 100644
--- a/script/tool/lib/src/version_check_command.dart
+++ b/script/tool/lib/src/version_check_command.dart
@@ -4,9 +4,9 @@
 
 import 'dart:async';
 
-import 'package:meta/meta.dart';
 import 'package:file/file.dart';
 import 'package:git/git.dart';
+import 'package:meta/meta.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:pubspec_parse/pubspec_parse.dart';
 
diff --git a/script/tool/test/analyze_command_test.dart b/script/tool/test/analyze_command_test.dart
index ac6b8eea67..11acb59a47 100644
--- a/script/tool/test/analyze_command_test.dart
+++ b/script/tool/test/analyze_command_test.dart
@@ -46,8 +46,10 @@ void main() {
               'flutter', const <String>['packages', 'get'], plugin1Dir.path),
           ProcessCall(
               'flutter', const <String>['packages', 'get'], plugin2Dir.path),
-          ProcessCall('dart', const <String>['analyze'], plugin1Dir.path),
-          ProcessCall('dart', const <String>['analyze'], plugin2Dir.path),
+          ProcessCall('dart', const <String>['analyze', '--fatal-infos'],
+              plugin1Dir.path),
+          ProcessCall('dart', const <String>['analyze', '--fatal-infos'],
+              plugin2Dir.path),
         ]));
   });
 
@@ -86,7 +88,8 @@ void main() {
           orderedEquals(<ProcessCall>[
             ProcessCall(
                 'flutter', const <String>['packages', 'get'], pluginDir.path),
-            ProcessCall('dart', const <String>['analyze'], pluginDir.path),
+            ProcessCall('dart', const <String>['analyze', '--fatal-infos'],
+                pluginDir.path),
           ]));
     });
 
diff --git a/script/tool/test/publish_plugin_command_test.dart b/script/tool/test/publish_plugin_command_test.dart
index 9966e59867..02d6d8140a 100644
--- a/script/tool/test/publish_plugin_command_test.dart
+++ b/script/tool/test/publish_plugin_command_test.dart
@@ -9,8 +9,8 @@ import 'dart:io' as io;
 import 'package:args/command_runner.dart';
 import 'package:file/file.dart';
 import 'package:file/local.dart';
-import 'package:flutter_plugin_tools/src/publish_plugin_command.dart';
 import 'package:flutter_plugin_tools/src/common.dart';
+import 'package:flutter_plugin_tools/src/publish_plugin_command.dart';
 import 'package:git/git.dart';
 import 'package:matcher/matcher.dart';
 import 'package:mockito/mockito.dart';
diff --git a/script/tool/test/util.dart b/script/tool/test/util.dart
index e926d60968..25b248b00a 100644
--- a/script/tool/test/util.dart
+++ b/script/tool/test/util.dart
@@ -9,9 +9,9 @@ import 'dart:io' as io;
 import 'package:args/command_runner.dart';
 import 'package:file/file.dart';
 import 'package:file/memory.dart';
+import 'package:flutter_plugin_tools/src/common.dart';
 import 'package:meta/meta.dart';
 import 'package:platform/platform.dart';
-import 'package:flutter_plugin_tools/src/common.dart';
 import 'package:quiver/collection.dart';
 
 // TODO(stuartmorgan): Eliminate this in favor of setting up a clean filesystem
diff --git a/script/tool/test/version_check_test.dart b/script/tool/test/version_check_test.dart
index 04348310a2..ea1a82ae74 100644
--- a/script/tool/test/version_check_test.dart
+++ b/script/tool/test/version_check_test.dart
@@ -8,11 +8,11 @@ import 'dart:io' as io;
 import 'package:args/command_runner.dart';
 import 'package:file/file.dart';
 import 'package:flutter_plugin_tools/src/common.dart';
+import 'package:flutter_plugin_tools/src/version_check_command.dart';
 import 'package:git/git.dart';
 import 'package:mockito/mockito.dart';
-import 'package:test/test.dart';
-import 'package:flutter_plugin_tools/src/version_check_command.dart';
 import 'package:pub_semver/pub_semver.dart';
+import 'package:test/test.dart';
 import 'util.dart';
 
 void testAllowedVersion(