diff --git a/tool/grind.dart b/tool/grind.dart
index f5e62f9335..14b6277bcc 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -12,8 +12,10 @@ 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) {
@@ -24,8 +26,8 @@ void checkUrls() async {
         log('checking: $url...');
         if (response.statusCode != 200) {
           fail(
-              '$url GET failed: [${response.statusCode}] ${response
-                  .reasonPhrase}');
+            '$url GET failed: [${response.statusCode}] ${response.reasonPhrase}',
+          );
         }
       }
     }
@@ -55,18 +57,21 @@ void outlineIcons() async {
   }
 }
 
-void _createPng(File sourceSvg,
-    String targetName, {
-      required int? size,
-      bool forLight = false,
-    }) {
+void _createPng(
+  File sourceSvg,
+  String targetName, {
+  required int? size,
+  bool forLight = false,
+}) {
   File targetFile = joinFile(sourceSvg.parent, [targetName]);
 
   String color = forLight ? '#7a7a7a' : '#9e9e9e';
 
   String originalContent = sourceSvg.readAsStringSync();
-  String newContent =
-  originalContent.replaceAll('<svg ', '<svg fill="$color" ');
+  String newContent = originalContent.replaceAll(
+    '<svg ',
+    '<svg fill="$color" ',
+  );
 
   sourceSvg.writeAsStringSync(newContent);
 
@@ -80,8 +85,8 @@ void _createPng(File sourceSvg,
 
     if (result.exitCode != 0) {
       print(
-          'Error resizing image with imagemagick: ${result.stdout}\n${result
-              .stderr}');
+        'Error resizing image with imagemagick: ${result.stdout}\n${result.stderr}',
+      );
       exit(1);
     }
   } finally {
diff --git a/tool/plugin/lib/build_spec.dart b/tool/plugin/lib/build_spec.dart
index 79a9c34297..d9671e4963 100644
--- a/tool/plugin/lib/build_spec.dart
+++ b/tool/plugin/lib/build_spec.dart
@@ -37,20 +37,20 @@ class BuildSpec {
   String? _changeLog;
 
   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';
+    : 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;
 
diff --git a/tool/plugin/lib/edit.dart b/tool/plugin/lib/edit.dart
index 59f44e0cff..af30fdd8c0 100644
--- a/tool/plugin/lib/edit.dart
+++ b/tool/plugin/lib/edit.dart
@@ -46,7 +46,7 @@ Future<int> applyEdits(BuildSpec spec, Future<int> Function() compileFn) async {
   // Handle skipped files.
   for (String file in spec.filesToSkip) {
     final entity =
-    FileSystemEntity.isFileSync(file) ? File(file) : Directory(file);
+        FileSystemEntity.isFileSync(file) ? File(file) : Directory(file);
     if (entity.existsSync()) {
       await entity.rename('$file~');
       log('renamed $file');
@@ -82,7 +82,7 @@ Future<int> applyEdits(BuildSpec spec, Future<int> Function() compileFn) async {
     for (final file in spec.filesToSkip) {
       final name = '$file~';
       final entity =
-      FileSystemEntity.isFileSync(name) ? File(name) : Directory(name);
+          FileSystemEntity.isFileSync(name) ? File(name) : Directory(name);
       if (entity.existsSync()) {
         await entity.rename(file);
       }
@@ -97,12 +97,11 @@ class EditCommand {
     required List<String> initials,
     required List<String> replacements,
     this.versions = const [],
-  })
-      : assert(initials.length == replacements.length),
-        assert(initials.isNotEmpty),
-        assert(versions.isNotEmpty),
-        initials = initials.map(_platformAdaptiveString).toList(),
-        replacements = replacements.map(_platformAdaptiveString).toList();
+  }) : assert(initials.length == replacements.length),
+       assert(initials.isNotEmpty),
+       assert(versions.isNotEmpty),
+       initials = initials.map(_platformAdaptiveString).toList(),
+       replacements = replacements.map(_platformAdaptiveString).toList();
 
   /// The target file path.
   final String path;
diff --git a/tool/plugin/lib/lint.dart b/tool/plugin/lib/lint.dart
index ba2ba46e4a..2f0edf7fe4 100644
--- a/tool/plugin/lib/lint.dart
+++ b/tool/plugin/lib/lint.dart
@@ -41,7 +41,11 @@ class LintCommand extends Command<int> {
     final result = Process.runSync(
       'git',
       // Note: extra quotes added so grep doesn't match this file.
-      ['grep', 'import com.jetbrains.' 'lang.dart.'],
+      [
+        'grep',
+        'import com.jetbrains.'
+            'lang.dart.',
+      ],
     );
     final String imports = (result.stdout as String).trim();
 
@@ -112,10 +116,7 @@ class LintCommand extends Command<int> {
     for (var import in proscribedImports) {
       print('Checking for import of "$import"...');
 
-      final result = Process.runSync(
-        'git',
-        ['grep', 'import $import'],
-      );
+      final result = Process.runSync('git', ['grep', 'import $import']);
 
       final String results = (result.stdout as String).trim();
       if (results.isNotEmpty) {
@@ -127,17 +128,12 @@ class LintCommand extends Command<int> {
       }
     }
 
-    final partialImports = [
-      'com.sun.',
-    ];
+    final partialImports = ['com.sun.'];
 
     for (var import in partialImports) {
       print('Checking for import of "$import"...');
 
-      final result = Process.runSync(
-        'git',
-        ['grep', 'import $import'],
-      );
+      final result = Process.runSync('git', ['grep', 'import $import']);
 
       final String results = (result.stdout as String).trim();
       if (results.isNotEmpty) {
diff --git a/tool/plugin/lib/plugin.dart b/tool/plugin/lib/plugin.dart
index 49dc37e56f..de8dbdd4f9 100644
--- a/tool/plugin/lib/plugin.dart
+++ b/tool/plugin/lib/plugin.dart
@@ -39,8 +39,11 @@ Future<int> main(List<String> args) async {
 
 void addProductFlags(ArgParser argParser, String verb) {
   argParser.addFlag('ij', help: '$verb the IntelliJ plugin', defaultsTo: true);
-  argParser.addFlag('as',
-      help: '$verb the Android Studio plugin', defaultsTo: true);
+  argParser.addFlag(
+    'as',
+    help: '$verb the Android Studio plugin',
+    defaultsTo: true,
+  );
 }
 
 void copyResources({required String from, required String to}) {
@@ -84,13 +87,14 @@ Future<bool> genPluginFiles(BuildSpec spec, String destDir) async {
 Future<void> genPluginXml(BuildSpec spec, String destDir, String path) async {
   var templatePath =
       '${path.substring(0, path.length - '.xml'.length)}_template.xml';
-  var file =
-  await File(p.join(rootPath, destDir, path)).create(recursive: true);
+  var file = await File(
+    p.join(rootPath, destDir, path),
+  ).create(recursive: true);
   log('writing ${p.relative(file.path)}');
   var dest = file.openWrite();
   dest.writeln(
-      "<!-- Do not edit; instead, modify ${p.basename(
-          templatePath)}, and run './bin/plugin generate'. -->");
+    "<!-- Do not edit; instead, modify ${p.basename(templatePath)}, and run './bin/plugin generate'. -->",
+  );
   dest.writeln();
   await utf8.decoder
       .bind(File(p.join(rootPath, 'resources', templatePath)).openRead())
@@ -110,12 +114,15 @@ bool genPresubmitYaml(List<BuildSpec> specs) {
     }
   }
 
-  var templateFile =
-  File(p.join(rootPath, '.github', 'workflows', 'presubmit.yaml.template'));
+  var templateFile = File(
+    p.join(rootPath, '.github', 'workflows', 'presubmit.yaml.template'),
+  );
   var templateContents = templateFile.readAsStringSync();
   // If we need to make many changes consider something like genPluginXml().
-  templateContents =
-      templateContents.replaceFirst('@VERSIONS@', versions.join(', '));
+  templateContents = templateContents.replaceFirst(
+    '@VERSIONS@',
+    versions.join(', '),
+  );
   var header =
       "# Do not edit; instead, modify ${p.basename(templateFile.path)},"
       " and run './bin/plugin generate'.\n\n";
@@ -150,9 +157,11 @@ bool isTravisFileValid() {
 
 Future<int> jar(String directory, String outFile) async {
   var args = ['cf', p.absolute(outFile)];
-  args.addAll(Directory(directory)
-      .listSync(followLinks: false)
-      .map((f) => p.basename(f.path)));
+  args.addAll(
+    Directory(
+      directory,
+    ).listSync(followLinks: false).map((f) => p.basename(f.path)),
+  );
   args.remove('.DS_Store');
   return await exec('jar', args, cwd: directory);
 }
@@ -170,8 +179,9 @@ Future<bool> performReleaseChecks(ProductCommand cmd) async {
       return false;
     }
     if (!cmd.isReleaseValid) {
-      log('the release identifier ("${cmd
-          .release}") must be of the form xx.x (major.minor)');
+      log(
+        'the release identifier ("${cmd.release}") must be of the form xx.x (major.minor)',
+      );
       return false;
     }
     var gitDir = await GitDir.fromExisting(rootPath);
@@ -180,10 +190,11 @@ Future<bool> performReleaseChecks(ProductCommand cmd) async {
       var branch = await gitDir.currentBranch();
       var name = branch.branchName;
       var expectedName =
-      cmd.isDevChannel ? 'master' : "release_${cmd.releaseMajor}";
+          cmd.isDevChannel ? 'master' : "release_${cmd.releaseMajor}";
       var result = name == expectedName;
       if (!result) {
-        result = name.startsWith("release_${cmd.releaseMajor}") &&
+        result =
+            name.startsWith("release_${cmd.releaseMajor}") &&
             name.lastIndexOf(RegExp(r"\.[0-9]")) == name.length - 2;
       }
       if (result) {
@@ -202,8 +213,9 @@ 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 &&
@@ -212,14 +224,15 @@ Future<bool> performReleaseChecks(ProductCommand cmd) async {
     return true;
   } else {
     log(
-        'Release mode requires the jxbrowser.properties file to exist and include a key.');
+      'Release mode requires the jxbrowser.properties file to exist and include a key.',
+    );
   }
   return false;
 }
 
 List<Map<String, Object?>> readProductMatrix() {
   var contents =
-  File(p.join(rootPath, 'product-matrix.json')).readAsStringSync();
+      File(p.join(rootPath, 'product-matrix.json')).readAsStringSync();
   var map = json.decode(contents);
   return (map['list'] as List<Object?>).cast<Map<String, Object?>>();
 }
@@ -239,8 +252,8 @@ String substituteTemplateVariables(String line, BuildSpec spec) {
       case 'CHANGELOG':
         return spec.changeLog;
       case 'DEPEND':
-      // If found, this is the module that triggers loading the Android Studio
-      // support. The public sources and the installable plugin use different ones.
+        // If found, this is the module that triggers loading the Android Studio
+        // support. The public sources and the installable plugin use different ones.
         return spec.isSynthetic
             ? 'com.intellij.modules.androidstudio'
             : 'com.android.tools.apk';
@@ -303,23 +316,33 @@ class GradleBuildCommand extends ProductCommand {
   final BuildCommandRunner runner;
 
   GradleBuildCommand(this.runner) : super('make') {
-    argParser.addOption('only-version',
-        abbr: 'o',
-        help: 'Only build the specified IntelliJ version; useful for sharding '
-            'builds on CI systems.');
-    argParser.addFlag('unpack',
-        abbr: 'u',
-        help: 'Unpack the artifact files during provisioning, '
-            'even if the cache appears fresh.\n'
-            'This flag is ignored if --release is given.',
-        defaultsTo: false);
-    argParser.addOption('minor',
-        abbr: 'm', help: 'Set the minor version number.');
+    argParser.addOption(
+      'only-version',
+      abbr: 'o',
+      help:
+          'Only build the specified IntelliJ version; useful for sharding '
+          'builds on CI systems.',
+    );
+    argParser.addFlag(
+      'unpack',
+      abbr: 'u',
+      help:
+          'Unpack the artifact files during provisioning, '
+          'even if the cache appears fresh.\n'
+          'This flag is ignored if --release is given.',
+      defaultsTo: false,
+    );
+    argParser.addOption(
+      'minor',
+      abbr: 'm',
+      help: 'Set the minor version number.',
+    );
     argParser.addFlag('setup', abbr: 's', defaultsTo: true);
   }
 
   @override
-  String get description => 'Build a deployable version of the Flutter plugin, '
+  String get description =>
+      'Build a deployable version of the Flutter plugin, '
       'compiled against the specified artifacts.';
 
   @override
@@ -402,8 +425,10 @@ class GradleBuildCommand extends ProductCommand {
     }
     // Print a summary of the collection of plugin versions built:
     var builtVersions = buildSpecs.map((spec) => spec.name).toList().join(', ');
-    log('\nMake of the ${buildSpecs.length} builds was '
-        'successful: $builtVersions.');
+    log(
+      '\nMake of the ${buildSpecs.length} builds was '
+      'successful: $builtVersions.',
+    );
     return result;
   }
 
@@ -426,21 +451,18 @@ class GradleBuildCommand extends ProductCommand {
 
     // Log the contents of ./build/distributions, this is useful in debugging
     // in general and especially useful for the Kokoro bot which is run remotely
-    final result = Process.runSync(
-      'ls',
-      ['-laf', '-laf', 'build/distributions'],
-    );
+    final result = Process.runSync('ls', [
+      '-laf',
+      '-laf',
+      'build/distributions',
+    ]);
     log('Content generated in ./build/distributions:\n${result.stdout}');
 
     var source = File('build/distributions/flutter-intellij.zip');
     if (!source.existsSync()) {
       source = File('build/distributions/flutter-intellij-kokoro.zip');
     }
-    _copyFile(
-      source,
-      file.parent,
-      filename: p.basename(file.path),
-    );
+    _copyFile(source, file.parent, filename: p.basename(file.path));
     await _stopDaemon();
     return 0;
   }
@@ -487,7 +509,11 @@ class DeployCommand extends ProductCommand {
       changeDirectory(file.parent);
       var pluginNumber = pluginRegistryIds[spec.pluginId];
       value = await upload(
-          p.basename(file.path), pluginNumber!, token, spec.channel);
+        p.basename(file.path),
+        pluginNumber!,
+        token,
+        spec.channel,
+      );
       if (value != 0) {
         return value;
       }
@@ -500,8 +526,12 @@ class DeployCommand extends ProductCommand {
     Directory.current = dir.path;
   }
 
-  Future<int> upload(String filePath, String pluginNumber, String token,
-      String channel) async {
+  Future<int> upload(
+    String filePath,
+    String pluginNumber,
+    String token,
+    String channel,
+  ) async {
     if (!File(filePath).existsSync()) {
       throw 'File not found: $filePath';
     }
@@ -523,11 +553,7 @@ https://plugins.jetbrains.com/plugin/uploadPlugin
       log('Upload failed: ${processResult.stderr} for file: $filePath');
     }
     final out = processResult.stdout as String;
-    var message = out
-        .trim()
-        .split('\n')
-        .last
-        .trim();
+    var message = out.trim().split('\n').last.trim();
     log(message);
     return processResult.exitCode;
   }
@@ -548,9 +574,9 @@ class GenerateCommand extends ProductCommand {
   @override
   String get description =>
       'Generate plugin.xml, .github/workflows/presubmit.yaml, '
-          'and resources/liveTemplates/flutter_miscellaneous.xml files for the '
-          'Flutter plugin.\nThe plugin.xml.template and product-matrix.json are '
-          'used as input.';
+      'and resources/liveTemplates/flutter_miscellaneous.xml files for the '
+      'Flutter plugin.\nThe plugin.xml.template and product-matrix.json are '
+      'used as input.';
 
   @override
   Future<int> doit() async {
@@ -571,14 +597,16 @@ class GenerateCommand extends ProductCommand {
 
   void generateLiveTemplates() {
     // Find all the live templates.
-    final templateFragments = Directory(p.join('resources', 'liveTemplates'))
-        .listSync()
-        .whereType<File>()
-        .where((file) => p.extension(file.path) == '.txt')
-        .cast<File>()
-        .toList();
-    final templateFile =
-    File(p.join('resources', 'liveTemplates', 'flutter_miscellaneous.xml'));
+    final templateFragments =
+        Directory(p.join('resources', 'liveTemplates'))
+            .listSync()
+            .whereType<File>()
+            .where((file) => p.extension(file.path) == '.txt')
+            .cast<File>()
+            .toList();
+    final templateFile = File(
+      p.join('resources', 'liveTemplates', 'flutter_miscellaneous.xml'),
+    );
     var contents = templateFile.readAsStringSync();
 
     log('writing ${p.relative(templateFile.path)}');
@@ -596,15 +624,15 @@ class GenerateCommand extends ProductCommand {
       final regexp = RegExp('<template name="$name" value="([^"]+)"');
       final match = regexp.firstMatch(contents);
       if (match == null) {
-        throw 'No entry found for "$name" live template in ${templateFile
-            .path}';
+        throw 'No entry found for "$name" live template in ${templateFile.path}';
       }
 
       // Replace the existing content in the xml live template file with the
       // content from the template $name.txt file.
       final matchString = match.group(1);
       final matchStart = contents.indexOf(matchString!);
-      contents = contents.substring(0, matchStart) +
+      contents =
+          contents.substring(0, matchStart) +
           replaceContents +
           contents.substring(matchStart + matchString.length);
     }
@@ -656,10 +684,12 @@ abstract class ProductCommand extends Command<int> {
 
   ProductCommand(this.name) {
     addProductFlags(argParser, name[0].toUpperCase() + name.substring(1));
-    argParser.addOption('channel',
-        abbr: 'c',
-        help: 'Select the channel to build: stable or dev',
-        defaultsTo: 'stable');
+    argParser.addOption(
+      'channel',
+      abbr: 'c',
+      help: 'Select the channel to build: stable or dev',
+      defaultsTo: 'stable',
+    );
   }
 
   String get channel => argResults!.option('channel')!;
@@ -715,11 +745,17 @@ abstract class ProductCommand extends Command<int> {
   }
 
   String releasesFilePath(BuildSpec spec) {
-    var subDir = isReleaseMode
-        ? 'release_$releaseMajor'
-        : (spec.channel == "stable" ? 'release_master' : 'release_dev');
+    var subDir =
+        isReleaseMode
+            ? 'release_$releaseMajor'
+            : (spec.channel == "stable" ? 'release_master' : 'release_dev');
     var filePath = p.join(
-        rootPath, 'releases', subDir, spec.version, 'flutter-intellij.zip');
+      rootPath,
+      'releases',
+      subDir,
+      spec.version,
+      'flutter-intellij.zip',
+    );
     return filePath;
   }
 
@@ -810,14 +846,22 @@ class RenamePackageCommand extends ProductCommand {
   late String newName;
 
   RenamePackageCommand(this.runner) : super('rename') {
-    argParser.addOption('package',
-        defaultsTo: 'com.android.tools.idea.npw',
-        help: 'Package to be renamed');
-    argParser.addOption('append',
-        defaultsTo: 'Old', help: 'Suffix to be appended to package name');
+    argParser.addOption(
+      'package',
+      defaultsTo: 'com.android.tools.idea.npw',
+      help: 'Package to be renamed',
+    );
+    argParser.addOption(
+      'append',
+      defaultsTo: 'Old',
+      help: 'Suffix to be appended to package name',
+    );
     argParser.addOption('new-name', help: 'Name of package after renaming');
-    argParser.addFlag('studio',
-        negatable: true, help: 'The package is in the flutter-studio module');
+    argParser.addFlag(
+      'studio',
+      negatable: true,
+      help: 'The package is in the flutter-studio module',
+    );
   }
 
   @override
@@ -830,9 +874,10 @@ class RenamePackageCommand extends ProductCommand {
       baseDir = p.join(baseDir, 'flutter-studio/src');
     }
     oldName = argResults.option('package')!;
-    newName = argResults.wasParsed('new-name')
-        ? argResults.option('new-name')!
-        : oldName + argResults.option('append')!;
+    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;
@@ -887,8 +932,11 @@ class RenamePackageCommand extends ProductCommand {
     }
   }
 
-  void _editAll(Directory src,
-      {required Directory skipOld, required Directory skipNew}) {
+  void _editAll(
+    Directory src, {
+    required Directory skipOld,
+    required Directory skipNew,
+  }) {
     if (src.path == skipOld.path || src.path == skipNew.path) return;
     for (var entity in src.listSync(followLinks: false)) {
       if (entity is File) {
@@ -906,10 +954,12 @@ class TestCommand extends ProductCommand {
   final BuildCommandRunner runner;
 
   TestCommand(this.runner) : super('test') {
-    argParser.addFlag('skip',
-        negatable: false,
-        help: 'Do not run tests, just unpack artifaccts',
-        abbr: 's');
+    argParser.addFlag(
+      'skip',
+      negatable: false,
+      help: 'Do not run tests, just unpack artifaccts',
+      abbr: 's',
+    );
     argParser.addFlag('setup', abbr: 'p', defaultsTo: true);
   }
 
diff --git a/tool/plugin/lib/runner.dart b/tool/plugin/lib/runner.dart
index 69751bf3ac..54ac194fd6 100644
--- a/tool/plugin/lib/runner.dart
+++ b/tool/plugin/lib/runner.dart
@@ -12,8 +12,10 @@ import 'util.dart';
 
 class BuildCommandRunner extends CommandRunner<int> {
   BuildCommandRunner()
-      : super('plugin',
-      'A script to build, test, and deploy the Flutter IntelliJ plugin.') {
+    : super(
+        'plugin',
+        'A script to build, test, and deploy the Flutter IntelliJ plugin.',
+      ) {
     argParser.addOption(
       'release',
       abbr: 'r',
@@ -29,10 +31,12 @@ class BuildCommandRunner extends CommandRunner<int> {
   }
 
   void writeJxBrowserKeyToFile() {
-    final jxBrowserKey =
-    readTokenFromKeystore('FLUTTER_KEYSTORE_JXBROWSER_KEY_NAME');
-    final propertiesFile =
-    File("$rootPath/resources/jxbrowser/jxbrowser.properties");
+    final jxBrowserKey = readTokenFromKeystore(
+      'FLUTTER_KEYSTORE_JXBROWSER_KEY_NAME',
+    );
+    final propertiesFile = File(
+      "$rootPath/resources/jxbrowser/jxbrowser.properties",
+    );
     if (jxBrowserKey.isNotEmpty) {
       final contents = '''
 jxbrowser.license.key=$jxBrowserKey
@@ -44,13 +48,19 @@ jxbrowser.license.key=$jxBrowserKey
   Future<int> buildPlugin(BuildSpec spec, String version) async {
     writeJxBrowserKeyToFile();
     return await runGradleCommand(
-        ['buildPlugin', '--stacktrace'], spec, version, 'false');
+      ['buildPlugin', '--stacktrace'],
+      spec,
+      version,
+      'false',
+    );
   }
 
-  Future<int> runGradleCommand(List<String> command,
-      BuildSpec spec,
-      String version,
-      String testing,) async {
+  Future<int> runGradleCommand(
+    List<String> command,
+    BuildSpec spec,
+    String version,
+    String testing,
+  ) async {
     final contents = '''
 name = "flutter-intellij
 buildSpec=${spec.version}
diff --git a/tool/plugin/lib/util.dart b/tool/plugin/lib/util.dart
index 1312687d4b..1b92858df7 100644
--- a/tool/plugin/lib/util.dart
+++ b/tool/plugin/lib/util.dart
@@ -32,8 +32,11 @@ Future<String> makeDevLog(BuildSpec spec) async {
   _checkGitDir();
   var gitDir = await GitDir.fromExisting(rootPath);
   var since = lastReleaseName;
-  var processResult =
-  await gitDir.runCommand(['log', '--oneline', '$since..HEAD']);
+  var processResult = await gitDir.runCommand([
+    'log',
+    '--oneline',
+    '$since..HEAD',
+  ]);
   String out = processResult.stdout as String;
   var messages = out.trim().split('\n');
   var devLog = StringBuffer();
@@ -48,49 +51,49 @@ Future<String> makeDevLog(BuildSpec spec) async {
 Future<DateTime> dateOfLastRelease() async {
   _checkGitDir();
   var gitDir = await GitDir.fromExisting(rootPath);
-  var processResult = await gitDir
-      .runCommand(['branch', '--list', '-v', '--no-abbrev', lastReleaseName]);
+  var processResult = await gitDir.runCommand([
+    'branch',
+    '--list',
+    '-v',
+    '--no-abbrev',
+    lastReleaseName,
+  ]);
   String out = processResult.stdout as String;
-  var logLine = out
-      .trim()
-      .split('\n')
-      .first
-      .trim();
-  var match =
-  RegExp(r'release_\d+\s+([A-Fa-f\d]{40})\s').matchAsPrefix(logLine);
+  var logLine = out.trim().split('\n').first.trim();
+  var match = RegExp(
+    r'release_\d+\s+([A-Fa-f\d]{40})\s',
+  ).matchAsPrefix(logLine);
   var commitHash = match!.group(1);
-  processResult =
-  await gitDir.runCommand(['show', '--pretty=tformat:"%cI"', commitHash!]);
+  processResult = await gitDir.runCommand([
+    'show',
+    '--pretty=tformat:"%cI"',
+    commitHash!,
+  ]);
   out = processResult.stdout as String;
-  var date = out
-      .trim()
-      .split('\n')
-      .first
-      .trim();
+  var date = out.trim().split('\n').first.trim();
   return DateTime.parse(date.replaceAll('"', ''));
 }
 
 Future<String> lastRelease() async {
   _checkGitDir();
   var gitDir = await GitDir.fromExisting(rootPath);
-  var processResult =
-  await gitDir.runCommand(['branch', '--list', 'release_*']);
+  var processResult = await gitDir.runCommand([
+    'branch',
+    '--list',
+    'release_*',
+  ]);
   String out = processResult.stdout as String;
-  var release = out
-      .trim()
-      .split('\n')
-      .last
-      .trim();
+  var release = out.trim().split('\n').last.trim();
   if (release.isNotEmpty) return release;
-  processResult =
-  await gitDir.runCommand(['branch', '--list', '-a', '*release_*']);
+  processResult = await gitDir.runCommand([
+    'branch',
+    '--list',
+    '-a',
+    '*release_*',
+  ]);
   out = processResult.stdout as String;
   var remote =
-  out
-      .trim()
-      .split('\n')
-      .last
-      .trim(); // "remotes/origin/release_43"
+      out.trim().split('\n').last.trim(); // "remotes/origin/release_43"
   release = remote.substring(remote.lastIndexOf('/') + 1);
   await gitDir.runCommand(['branch', '--track', release, remote]);
   return release;
@@ -125,12 +128,7 @@ Future<void> removeAll(String dir) async {
 }
 
 bool isNewer(FileSystemEntity newer, FileSystemEntity older) {
-  return newer
-      .statSync()
-      .modified
-      .isAfter(older
-      .statSync()
-      .modified);
+  return newer.statSync().modified.isAfter(older.statSync().modified);
 }
 
 void _checkGitDir() async {
@@ -163,9 +161,7 @@ int get devBuildNumber {
   // The dev channel is automatically refreshed weekly, so the build number
   // is just the number of weeks since the last stable release.
   var today = DateTime.now();
-  var daysSinceRelease = today
-      .difference(lastReleaseDate)
-      .inDays;
+  var daysSinceRelease = today.difference(lastReleaseDate).inDays;
   var weekNumber = daysSinceRelease ~/ 7 + 1;
   return weekNumber;
 }
@@ -184,8 +180,9 @@ String buildVersionNumber(BuildSpec spec) {
 }
 
 String _nextRelease() {
-  var current =
-  RegExp(r'release_(\d+)').matchAsPrefix(lastReleaseName)!.group(1);
+  var current = RegExp(
+    r'release_(\d+)',
+  ).matchAsPrefix(lastReleaseName)!.group(1);
   var val = int.parse(current!) + 1;
   return '$val.0';
 }
diff --git a/tool/plugin/lib/verify.dart b/tool/plugin/lib/verify.dart
index d04f547a3e..200ed2693a 100644
--- a/tool/plugin/lib/verify.dart
+++ b/tool/plugin/lib/verify.dart
@@ -12,10 +12,13 @@ class VerifyCommand extends ProductCommand {
   final BuildCommandRunner runner;
 
   VerifyCommand(this.runner) : super('verify') {
-    argParser.addOption('only-version',
-        abbr: 'o',
-        help: 'Only verify the specified IntelliJ version; useful for sharding '
-            'builds on CI systems.');
+    argParser.addOption(
+      'only-version',
+      abbr: 'o',
+      help:
+          'Only verify the specified IntelliJ version; useful for sharding '
+          'builds on CI systems.',
+    );
   }
 
   @override
@@ -47,33 +50,54 @@ class VerifyCommand extends ProductCommand {
     for (var spec in buildSpecs) {
       log('\nverifyPluginProjectConfiguration for $spec:');
       result = await runner.runGradleCommand(
-          ['verifyPluginProjectConfiguration'], spec, '1', 'false');
+        ['verifyPluginProjectConfiguration'],
+        spec,
+        '1',
+        'false',
+      );
       if (result != 0) {
         return result;
       }
       log('\nverifyPluginStructure for $spec:');
-      result = await runner
-          .runGradleCommand(['verifyPluginStructure'], spec, '1', 'false');
+      result = await runner.runGradleCommand(
+        ['verifyPluginStructure'],
+        spec,
+        '1',
+        'false',
+      );
       if (result != 0) {
         return result;
       }
       log('\nverifyPluginSignature for $spec:');
-      result = await runner
-          .runGradleCommand(['verifyPluginSignature'], spec, '1', 'false');
+      result = await runner.runGradleCommand(
+        ['verifyPluginSignature'],
+        spec,
+        '1',
+        'false',
+      );
       if (result != 0) {
         return result;
       }
       log('\nverifyPlugin for $spec:');
-      result =
-      await runner.runGradleCommand(['verifyPlugin'], spec, '1', 'false');
+      result = await runner.runGradleCommand(
+        ['verifyPlugin'],
+        spec,
+        '1',
+        'false',
+      );
       if (result != 0) {
         return result;
       }
     }
 
-    var verifiedVersions = buildSpecs.map((spec) => spec.name).toList().join(', ');
-    log('\nVerification of the ${buildSpecs.length} builds was '
-        'successful: $verifiedVersions.');
+    var verifiedVersions = buildSpecs
+        .map((spec) => spec.name)
+        .toList()
+        .join(', ');
+    log(
+      '\nVerification of the ${buildSpecs.length} builds was '
+      'successful: $verifiedVersions.',
+    );
     return result;
   }
 }
diff --git a/tool/plugin/test/plugin_test.dart b/tool/plugin/test/plugin_test.dart
index a63be0881c..ec9ea4c873 100644
--- a/tool/plugin/test/plugin_test.dart
+++ b/tool/plugin/test/plugin_test.dart
@@ -144,15 +144,11 @@ void main() {
     test('clean', () async {
       var dir = Directory.current;
       var runner = makeTestRunner();
-      await runner.run([
-        "-r=19",
-        "-d../..",
-        "deploy",
-        "--no-as",
-        "--no-ij"
-      ]).whenComplete(() {
-        expect(Directory.current.path, equals(dir.path));
-      });
+      await runner
+          .run(["-r=19", "-d../..", "deploy", "--no-as", "--no-ij"])
+          .whenComplete(() {
+            expect(Directory.current.path, equals(dir.path));
+          });
     });
 
     test('without --release', () async {
@@ -283,7 +279,11 @@ class TestDeployCommand extends DeployCommand {
 
   @override
   Future<int> upload(
-      String filePath, String pluginNumber, String token, String channel) {
+    String filePath,
+    String pluginNumber,
+    String token,
+    String channel,
+  ) {
     paths.add(filePath);
     plugins.add(pluginNumber);
     return Future(() => 0);