Use shared workspace and analysis options for repo tools (flutter#7714)

There's likely some restructuring and other cleanup that could be made,
but this is just a simple resolving of the new diagnostics from the
shared analysis options.

Author: parlough

flutter-idea/testData/sample_tests/pubspec.yaml

@@ -3,7 +3,7 @@ description: Sample tests used as test data for the Flutter IntelliJ plugin.
 version: 0.0.1
 
 environment:
-  sdk: '>=3.5.0-0.0 <4.0.0'
+  sdk: ^3.5.0
 
 dev_dependencies:
   lints: ^5.0.0

pubspec.yaml

@@ -1,15 +1,19 @@
 name: flutter_intellij
 version: 0.1.0
+publish_to: none
 
 environment:
-  sdk: '>=3.5.0-0.0 <4.0.0'
+  sdk: ^3.5.0
+
+workspace:
+  - tool/plugin
 
 dependencies:
   args: any
   path: any
 
 dev_dependencies:
-  grinder: ^0.9.0
-  http: ^1.1.2
+  grinder: ^0.9.3
+  http: ^1.2.0
   lints: ^5.0.0
   meta: any

tool/grind.dart

@@ -12,8 +12,8 @@ void main(List<String> args) => grind(args);
 @Task('Check plugin URLs for live-ness')
 void checkUrls() async {
   log('checking URLs in FlutterBundle.properties...');
-  var lines =
-      await File('flutter-idea/src/io/flutter/FlutterBundle.properties').readAsLines();
+  var lines = await File('flutter-idea/src/io/flutter/FlutterBundle.properties')
+      .readAsLines();
   for (var line in lines) {
     var split = line.split('=');
     if (split.length == 2) {

tool/plugin/analysis_options.yaml

@@ -26,25 +26,25 @@ class BuildSpec {
   final String untilBuild;
   final String pluginId = 'io.flutter';
   final String? release;
-  final List<dynamic> filesToSkip;
+  final List<String> filesToSkip;
   String channel;
   String? _changeLog;
 
-  BuildSpec.fromJson(Map json, this.release)
-      : name = json['name'],
-        channel = json['channel'],
-        version = json['version'],
-        ijVersion = json['ijVersion'],
-        ideaProduct = json['ideaProduct'],
-        ideaVersion = json['ideaVersion'],
-        baseVersion = json['baseVersion'] ?? json['ideaVersion'],
-        androidPluginVersion = json['androidPluginVersion'],
-        dartPluginVersion = json['dartPluginVersion'],
-        sinceBuild = json['sinceBuild'],
-        untilBuild = json['untilBuild'],
-        filesToSkip = json['filesToSkip'] ?? [],
-        isUnitTestTarget = (json['isUnitTestTarget'] ?? 'false') == 'true',
-        isTestTarget = (json['isTestTarget'] ?? 'false') == 'true';
+  BuildSpec.fromJson(Map<String, Object?> json, this.release)
+      : name = json['name'] as String,
+        channel = json['channel'] as String,
+        version = json['version'] as String,
+        ijVersion = json['ijVersion'] as String?,
+        ideaProduct = json['ideaProduct'] as String,
+        ideaVersion = json['ideaVersion'] as String,
+        baseVersion = (json['baseVersion'] ?? json['ideaVersion']) as String,
+        androidPluginVersion = json['androidPluginVersion'] as String,
+        dartPluginVersion = json['dartPluginVersion'] as String,
+        sinceBuild = json['sinceBuild'] as String,
+        untilBuild = json['untilBuild'] as String,
+        filesToSkip = json['filesToSkip'] as List<String>? ?? [],
+        isUnitTestTarget = json['isUnitTestTarget'] == 'true',
+        isTestTarget = json['isTestTarget'] == 'true';
 
   bool get copyIjVersion => isAndroidStudio && ijVersion != null;
 
@@ -61,15 +61,15 @@ class BuildSpec {
   String get productFile => isAndroidStudio ? "$ideaProduct-ide" : ideaProduct;
 
   String get changeLog {
-    if (_changeLog == null) {
-      if (channel == 'stable') {
-        _changeLog = _parseChangelog();
-      } else {
-        _changeLog = '';
-      }
+    if (_changeLog case final changelog?) {
+      return changelog;
     }
 
-    return _changeLog!;
+    if (channel == 'stable') {
+      return _changeLog = _parseChangelog();
+    } else {
+      return _changeLog = '';
+    }
   }
 
   String _parseChangelog() {
@@ -124,10 +124,13 @@ class BuildSpec {
 /// last one is the latest used during development. This BuildSpec combines
 /// those two.
 class SyntheticBuildSpec extends BuildSpec {
-  late BuildSpec alternate;
+  late final BuildSpec alternate;
 
   SyntheticBuildSpec.fromJson(
-      super.json, super.releaseNum, List<BuildSpec> specs) :super.fromJson() {
+    super.json,
+    super.releaseNum,
+    List<BuildSpec> specs,
+  ) : super.fromJson() {
     try {
       // 'isUnitTestTarget' should always be in the spec for the latest IntelliJ (not AS).
       alternate = specs.firstWhere((s) => s.isUnitTestTarget);

tool/plugin/lib/build_spec.dart

@@ -26,7 +26,6 @@ void checkAndClearAppliedEditCommands() {
 }
 
 List<EditCommand> editCommands = [
-
   // When using LATEST-EAP-SNAPSHOT, also set baseVersion to LATEST-EAP-SNAPSHOT in the build spec.
   // EditCommand(
   //   path: 'build.gradle.kts',
@@ -43,7 +42,7 @@ List<EditCommand> editCommands = [
 ];
 
 /// Apply all the editCommands applicable to a given BuildSpec.
-Future<int> applyEdits(BuildSpec spec, Function compileFn) async {
+Future<int> applyEdits(BuildSpec spec, Future<int> Function() compileFn) async {
   // Handle skipped files.
   for (String file in spec.filesToSkip) {
     final entity =

tool/plugin/lib/edit.dart

@@ -9,7 +9,7 @@ import 'package:args/command_runner.dart';
 import 'runner.dart';
 import 'util.dart';
 
-class LintCommand extends Command {
+class LintCommand extends Command<int> {
   @override
   final BuildCommandRunner runner;
 
@@ -43,7 +43,7 @@ class LintCommand extends Command {
       // Note: extra quotes added so grep doesn't match this file.
       ['grep', 'import com.jetbrains.' 'lang.dart.'],
     );
-    final String imports = result.stdout.trim();
+    final String imports = (result.stdout as String).trim();
 
     // path:import
     final usages = <String, List<String>>{};
@@ -107,7 +107,7 @@ class LintCommand extends Command {
         ['grep', 'import $import'],
       );
 
-      final String results = result.stdout.trim();
+      final String results = (result.stdout as String).trim();
       if (results.isNotEmpty) {
         print('Found proscribed imports:\n');
         print(results);
@@ -129,7 +129,7 @@ class LintCommand extends Command {
         ['grep', 'import $import'],
       );
 
-      final String results = result.stdout.trim();
+      final String results = (result.stdout as String).trim();
       if (results.isNotEmpty) {
         print('Found proscribed imports:\n');
         print(results);

tool/plugin/lib/lint.dart

@@ -81,7 +81,7 @@ Future<bool> genPluginFiles(BuildSpec spec, String destDir) async {
   return true;
 }
 
-Future<File> genPluginXml(BuildSpec spec, String destDir, String path) async {
+Future<void> genPluginXml(BuildSpec spec, String destDir, String path) async {
   var templatePath =
       '${path.substring(0, path.length - '.xml'.length)}_template.xml';
   var file =
@@ -96,7 +96,7 @@ Future<File> genPluginXml(BuildSpec spec, String destDir, String path) async {
       .transform(LineSplitter())
       .forEach((l) => dest.writeln(substituteTemplateVariables(l, spec)));
   await dest.close();
-  return await dest.done;
+  await dest.done;
 }
 
 bool genPresubmitYaml(List<BuildSpec> specs) {
@@ -200,21 +200,24 @@ Future<bool> performReleaseChecks(ProductCommand cmd) async {
     log('the current working directory is not managed by git: $rootPath');
   }
   // Finally, check that a jxbrowser.properties exists
-  var jxBrowserFile = File(p.join(rootPath, 'resources', 'jxbrowser', 'jxbrowser.properties'));
+  var jxBrowserFile =
+      File(p.join(rootPath, 'resources', 'jxbrowser', 'jxbrowser.properties'));
   var jxBrowserFileContents = jxBrowserFile.readAsStringSync();
-  if(jxBrowserFile.existsSync() && jxBrowserFileContents.isNotEmpty && !jxBrowserFileContents.contains("<KEY>")) {
+  if (jxBrowserFile.existsSync() &&
+      jxBrowserFileContents.isNotEmpty &&
+      !jxBrowserFileContents.contains("<KEY>")) {
     return true;
   } else {
     log('Release mode requires the jxbrowser.properties file to exist and include a key.');
   }
   return false;
 }
 
-List readProductMatrix() {
+List<Map<String, Object?>> readProductMatrix() {
   var contents =
       File(p.join(rootPath, 'product-matrix.json')).readAsStringSync();
   var map = json.decode(contents);
-  return map['list'];
+  return (map['list'] as List<Object?>).cast<Map<String, Object?>>();
 }
 
 String substituteTemplateVariables(String line, BuildSpec spec) {
@@ -389,8 +392,9 @@ abstract class BuildCommand extends ProductCommand {
 
   @override
   Future<int> doit() async {
+    final argResults = this.argResults!;
     if (isReleaseMode) {
-      if (argResults!['unpack']) {
+      if (argResults.flag('unpack')) {
         separator('Release mode (--release) implies --unpack');
       }
       if (!await performReleaseChecks(this)) {
@@ -399,7 +403,7 @@ abstract class BuildCommand extends ProductCommand {
     }
 
     // Check to see if we should only be building a specific version.
-    String? onlyVersion = argResults!['only-version'];
+    final onlyVersion = argResults.option('only-version');
 
     var buildSpecs = specs;
     if (onlyVersion != null && onlyVersion.isNotEmpty) {
@@ -410,7 +414,7 @@ abstract class BuildCommand extends ProductCommand {
       }
     }
 
-    String? minorNumber = argResults!['minor'];
+    final minorNumber = argResults.option('minor');
     if (minorNumber != null) {
       pluginCount = int.parse(minorNumber) - 1;
     }
@@ -458,7 +462,7 @@ abstract class BuildCommand extends ProductCommand {
       separator('Built artifact');
       log(releasesFilePath(spec));
     }
-    if (argResults!['only-version'] == null) {
+    if (argResults.option('only-version') == null) {
       checkAndClearAppliedEditCommands();
     }
 
@@ -534,7 +538,7 @@ https://plugins.jetbrains.com/plugin/uploadPlugin
     if (processResult.exitCode != 0) {
       log('Upload failed: ${processResult.stderr} for file: $filePath');
     }
-    String out = processResult.stdout;
+    final out = processResult.stdout as String;
     var message = out.trim().split('\n').last.trim();
     log(message);
     return processResult.exitCode;
@@ -577,9 +581,6 @@ class GenerateCommand extends ProductCommand {
     return 0;
   }
 
-  SyntheticBuildSpec makeSyntheticSpec(List specs) =>
-      SyntheticBuildSpec.fromJson(specs[0], release, specs[2]);
-
   void generateLiveTemplates() {
     // Find all the live templates.
     final templateFragments = Directory(p.join('resources', 'liveTemplates'))
@@ -623,7 +624,7 @@ class GenerateCommand extends ProductCommand {
   }
 }
 
-abstract class ProductCommand extends Command {
+abstract class ProductCommand extends Command<int> {
   @override
   final String name;
   late List<BuildSpec> specs;
@@ -636,16 +637,16 @@ abstract class ProductCommand extends Command {
         defaultsTo: 'stable');
   }
 
-  String get channel => argResults!['channel'];
+  String get channel => argResults!.option('channel')!;
 
   bool get isDevChannel => channel == 'dev';
 
   /// Returns true when running in the context of a unit test.
   bool get isTesting => false;
 
-  bool get isForAndroidStudio => argResults!['as'];
+  bool get isForAndroidStudio => argResults!.flag('as');
 
-  bool get isForIntelliJ => argResults!['ij'];
+  bool get isForIntelliJ => argResults!.flag('ij');
 
   DateTime get releaseDate => lastReleaseDate;
 
@@ -660,10 +661,10 @@ abstract class ProductCommand extends Command {
     return rel == RegExp(r'^\d+\.\d(?:-dev.\d)?$').stringMatch(rel);
   }
 
-  bool get isTestMode => globalResults!['cwd'] != null;
+  bool get isTestMode => globalResults!.option('cwd') != null;
 
   String? get release {
-    String? rel = globalResults!['release'];
+    var rel = globalResults!.option('release');
 
     if (rel != null) {
       if (rel.startsWith('=')) {
@@ -729,7 +730,7 @@ abstract class ProductCommand extends Command {
     // Initialization constraint: rootPath depends on arg parsing, and
     // lastReleaseName and lastReleaseDate depend on rootPath.
     rootPath = Directory.current.path;
-    var rel = globalResults!['cwd'];
+    var rel = globalResults!.option('cwd');
     if (rel != null) {
       rootPath = p.normalize(p.join(rootPath, rel));
     }
@@ -799,11 +800,14 @@ class RenamePackageCommand extends ProductCommand {
 
   @override
   Future<int> doit() async {
-    if (argResults!['studio']) baseDir = p.join(baseDir, 'flutter-studio/src');
-    oldName = argResults!['package'];
-    newName = argResults!.wasParsed('new-name')
-        ? argResults!['new-name']
-        : oldName + argResults!['append'];
+    final argResults = this.argResults!;
+    if (argResults.flag('studio')) {
+      baseDir = p.join(baseDir, 'flutter-studio/src');
+    }
+    oldName = argResults.option('package')!;
+    newName = argResults.wasParsed('new-name')
+        ? argResults.option('new-name')!
+        : oldName + argResults.option('append')!;
     if (oldName == newName) {
       log('Nothing to do; new name is same as old name');
       return 1;
@@ -901,8 +905,8 @@ class TestCommand extends ProductCommand {
     log('JAVA_HOME=$javaHome');
 
     final spec = specs.firstWhere((s) => s.isUnitTestTarget);
-    if (!argResults!['skip']) {
-      if (argResults!['integration']) {
+    if (!argResults!.flag('skip')) {
+      if (argResults!.flag('integration')) {
         return await _runIntegrationTests();
       } else {
         return await _runUnitTests(spec);

tool/plugin/lib/plugin.dart

@@ -10,7 +10,7 @@ import 'build_spec.dart';
 import 'globals.dart';
 import 'util.dart';
 
-class BuildCommandRunner extends CommandRunner {
+class BuildCommandRunner extends CommandRunner<int> {
   BuildCommandRunner()
       : super('plugin',
             'A script to build, test, and deploy the Flutter IntelliJ plugin.') {
@@ -43,7 +43,8 @@ jxbrowser.license.key=$jxBrowserKey
 
   Future<int> buildPlugin(BuildSpec spec, String version) async {
     writeJxBrowserKeyToFile();
-    return await runGradleCommand(['buildPlugin', '--stacktrace'], spec, version, 'false');
+    return await runGradleCommand(
+        ['buildPlugin', '--stacktrace'], spec, version, 'false');
   }
 
   Future<int> runGradleCommand(