Enable analysis for the tool directory (flutter#3853)

stuartmorgan-g · web-flow · commit 19efaccc5da6 · 2021-05-07T09:40:28.000-07:00
Since the tooling doesn't live in packages/, we're not currently analyzing it. This enables analysis so that we won't have analyzer issues creeping in over time.

To minimize complexity, this just adds it directly to the Cirrus configuration rather than building knowledge of the tool directory into the tool itself.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -57,9 +57,6 @@ task:
     - name: format
       format_script: ./script/incremental_build.sh format --fail-on-change
       license_script:
-        - cd script/tool
-        - pub get
-        - cd ../..
         - dart script/tool/lib/src/main.dart license-check
     - name: test
       env:
@@ -72,7 +69,10 @@ task:
       env:
         matrix:
           CHANNEL: "master"
-      script:
+      tool_script:
+        - cd script/tool
+        - dart analyze --fatal-infos
+      plugins_script:
         - ./script/incremental_build.sh analyze
     ## TODO(cyanglaz):
     ## Combing stable and master analyze jobs when integration test null safety is ready on flutter stable.
diff --git a/script/tool/lib/src/drive_examples_command.dart b/script/tool/lib/src/drive_examples_command.dart
@@ -101,13 +101,13 @@ class DriveExamplesCommand extends PluginCommand {
                 fileSystem.directory(p.join(example.path, 'integration_test'));
 
             if (await integrationTests.exists()) {
-              await for (final FileSystemEntity integration_test
+              await for (final FileSystemEntity integrationTest
                   in integrationTests.list()) {
-                if (!integration_test.basename.endsWith('_test.dart')) {
+                if (!integrationTest.basename.endsWith('_test.dart')) {
                   continue;
                 }
                 targetPaths
-                    .add(p.relative(integration_test.path, from: example.path));
+                    .add(p.relative(integrationTest.path, from: example.path));
               }
             }
 
diff --git a/script/tool/lib/src/version_check_command.dart b/script/tool/lib/src/version_check_command.dart
@@ -187,7 +187,7 @@ class VersionCheckCommand extends PluginCommand {
 
     // Skip validation for the special NEXT version that's used to accumulate
     // changes that don't warrant publishing on their own.
-    bool hasNextSection = versionString == 'NEXT';
+    final bool hasNextSection = versionString == 'NEXT';
     if (hasNextSection) {
       print('Found NEXT; validating next version in the CHANGELOG.');
       // Ensure that the version in pubspec hasn't changed without updating

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,13 @@ class DriveExamplesCommand extends PluginCommand {`
`101`	`101`	`fileSystem.directory(p.join(example.path, 'integration_test'));`
`102`	`102`
`103`	`103`	`if (await integrationTests.exists()) {`
`104`		`- await for (final FileSystemEntity integration_test`
	`104`	`+ await for (final FileSystemEntity integrationTest`
`105`	`105`	`in integrationTests.list()) {`
`106`		`- if (!integration_test.basename.endsWith('_test.dart')) {`
	`106`	`+ if (!integrationTest.basename.endsWith('_test.dart')) {`
`107`	`107`	`continue;`
`108`	`108`	`}`
`109`	`109`	`targetPaths`
`110`		`- .add(p.relative(integration_test.path, from: example.path));`
	`110`	`+ .add(p.relative(integrationTest.path, from: example.path));`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`