From 82934622c9fae17e5729b28b914ba66fa3affb9d Mon Sep 17 00:00:00 2001
From: Jaime Wren <jwren@google.com>
Date: Thu, 14 Nov 2024 18:39:51 -0800
Subject: [PATCH] Dartfmt on Dart sources in tool dir (#7786)

---
 tool/grind.dart                   | 19 +++++++------
 tool/plugin/lib/build_spec.dart   | 10 +++----
 tool/plugin/lib/edit.dart         |  7 +++--
 tool/plugin/lib/lint.dart         |  4 ++-
 tool/plugin/lib/plugin.dart       | 42 ++++++++++++++++-----------
 tool/plugin/lib/runner.dart       | 16 +++++------
 tool/plugin/lib/util.dart         | 47 +++++++++++++++++++++++--------
 tool/plugin/lib/verify.dart       |  5 ++--
 tool/plugin/test/plugin_test.dart |  6 ++--
 9 files changed, 95 insertions(+), 61 deletions(-)

diff --git a/tool/grind.dart b/tool/grind.dart
index 5319826c6e..f5e62f9335 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -24,7 +24,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}');
         }
       }
     }
@@ -54,19 +55,18 @@ 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" ');
+  originalContent.replaceAll('<svg ', '<svg fill="$color" ');
 
   sourceSvg.writeAsStringSync(newContent);
 
@@ -80,7 +80,8 @@ void _createPng(
 
     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 167e57469b..3604cb15c8 100644
--- a/tool/plugin/lib/build_spec.dart
+++ b/tool/plugin/lib/build_spec.dart
@@ -13,6 +13,7 @@ class BuildSpec {
   // TODO (jwren) can we get rid of "name"
   final String name;
   // TODO (jwren) these two can be consilidated
+
   final String version;
   final String? ijVersion;
   final bool isTestTarget;
@@ -21,6 +22,7 @@ class BuildSpec {
   final String ideaVersion;
   final String androidPluginVersion;
   final String dartPluginVersion;
+
   // TODO (jwren) can baseVersion be removed?
   final String baseVersion;
 
@@ -129,11 +131,9 @@ class BuildSpec {
 class SyntheticBuildSpec extends BuildSpec {
   late final BuildSpec alternate;
 
-  SyntheticBuildSpec.fromJson(
-    super.json,
-    super.releaseNum,
-    List<BuildSpec> specs,
-  ) : super.fromJson() {
+  SyntheticBuildSpec.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);
diff --git a/tool/plugin/lib/edit.dart b/tool/plugin/lib/edit.dart
index 9468f3f608..59f44e0cff 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,7 +97,8 @@ class EditCommand {
     required List<String> initials,
     required List<String> replacements,
     this.versions = const [],
-  })  : assert(initials.length == replacements.length),
+  })
+      : assert(initials.length == replacements.length),
         assert(initials.isNotEmpty),
         assert(versions.isNotEmpty),
         initials = initials.map(_platformAdaptiveString).toList(),
diff --git a/tool/plugin/lib/lint.dart b/tool/plugin/lib/lint.dart
index fc27c706a0..43c152953f 100644
--- a/tool/plugin/lib/lint.dart
+++ b/tool/plugin/lib/lint.dart
@@ -49,7 +49,9 @@ class LintCommand extends Command<int> {
     final usages = <String, List<String>>{};
 
     imports.split('\n').forEach((String line) {
-      if (line.trim().isEmpty) {
+      if (line
+          .trim()
+          .isEmpty) {
         return;
       }
 
diff --git a/tool/plugin/lib/plugin.dart b/tool/plugin/lib/plugin.dart
index ab48cb62fb..c85828581e 100644
--- a/tool/plugin/lib/plugin.dart
+++ b/tool/plugin/lib/plugin.dart
@@ -85,11 +85,12 @@ 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);
+  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,7 +111,7 @@ bool genPresubmitYaml(List<BuildSpec> specs) {
   }
 
   var templateFile =
-      File(p.join(rootPath, '.github', 'workflows', 'presubmit.yaml.template'));
+  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 =
@@ -169,7 +170,8 @@ 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);
@@ -178,7 +180,7 @@ 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}") &&
@@ -201,7 +203,7 @@ Future<bool> performReleaseChecks(ProductCommand cmd) async {
   }
   // Finally, check that a jxbrowser.properties exists
   var jxBrowserFile =
-      File(p.join(rootPath, 'resources', 'jxbrowser', 'jxbrowser.properties'));
+  File(p.join(rootPath, 'resources', 'jxbrowser', 'jxbrowser.properties'));
   var jxBrowserFileContents = jxBrowserFile.readAsStringSync();
   if (jxBrowserFile.existsSync() &&
       jxBrowserFileContents.isNotEmpty &&
@@ -209,14 +211,15 @@ Future<bool> performReleaseChecks(ProductCommand cmd) async {
       !jxBrowserFileContents.contains('jxbrowser.license.key=<KEY>')) {
     return true;
   } else {
-    log('Release mode requires the jxbrowser.properties file to exist and include a key.');
+    log(
+        '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?>>();
 }
@@ -236,8 +239,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';
@@ -426,7 +429,7 @@ class GradleBuildCommand extends ProductCommand {
     log('Content generated in ./build/distributions:\n${result.stdout}');
 
     var source = File('build/distributions/flutter-intellij.zip');
-    if(!source.existsSync()) {
+    if (!source.existsSync()) {
       source = File('build/distributions/flutter-intellij-kokoro.zip');
     }
     _copyFile(
@@ -516,7 +519,11 @@ 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;
   }
@@ -537,9 +544,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 {
@@ -567,7 +574,7 @@ class GenerateCommand extends ProductCommand {
         .cast<File>()
         .toList();
     final templateFile =
-        File(p.join('resources', 'liveTemplates', 'flutter_miscellaneous.xml'));
+    File(p.join('resources', 'liveTemplates', 'flutter_miscellaneous.xml'));
     var contents = templateFile.readAsStringSync();
 
     log('writing ${p.relative(templateFile.path)}');
@@ -585,7 +592,8 @@ 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
diff --git a/tool/plugin/lib/runner.dart b/tool/plugin/lib/runner.dart
index d04ece8178..69751bf3ac 100644
--- a/tool/plugin/lib/runner.dart
+++ b/tool/plugin/lib/runner.dart
@@ -13,7 +13,7 @@ import 'util.dart';
 class BuildCommandRunner extends CommandRunner<int> {
   BuildCommandRunner()
       : super('plugin',
-            'A script to build, test, and deploy the Flutter IntelliJ plugin.') {
+      'A script to build, test, and deploy the Flutter IntelliJ plugin.') {
     argParser.addOption(
       'release',
       abbr: 'r',
@@ -30,9 +30,9 @@ class BuildCommandRunner extends CommandRunner<int> {
 
   void writeJxBrowserKeyToFile() {
     final jxBrowserKey =
-        readTokenFromKeystore('FLUTTER_KEYSTORE_JXBROWSER_KEY_NAME');
+    readTokenFromKeystore('FLUTTER_KEYSTORE_JXBROWSER_KEY_NAME');
     final propertiesFile =
-        File("$rootPath/resources/jxbrowser/jxbrowser.properties");
+    File("$rootPath/resources/jxbrowser/jxbrowser.properties");
     if (jxBrowserKey.isNotEmpty) {
       final contents = '''
 jxbrowser.license.key=$jxBrowserKey
@@ -47,12 +47,10 @@ jxbrowser.license.key=$jxBrowserKey
         ['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 1078b7a2a2..1312687d4b 100644
--- a/tool/plugin/lib/util.dart
+++ b/tool/plugin/lib/util.dart
@@ -33,7 +33,7 @@ Future<String> makeDevLog(BuildSpec spec) async {
   var gitDir = await GitDir.fromExisting(rootPath);
   var since = lastReleaseName;
   var processResult =
-      await gitDir.runCommand(['log', '--oneline', '$since..HEAD']);
+  await gitDir.runCommand(['log', '--oneline', '$since..HEAD']);
   String out = processResult.stdout as String;
   var messages = out.trim().split('\n');
   var devLog = StringBuffer();
@@ -51,14 +51,22 @@ Future<DateTime> dateOfLastRelease() async {
   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 logLine = out
+      .trim()
+      .split('\n')
+      .first
+      .trim();
   var match =
-      RegExp(r'release_\d+\s+([A-Fa-f\d]{40})\s').matchAsPrefix(logLine);
+  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!]);
+  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('"', ''));
 }
 
@@ -66,15 +74,23 @@ Future<String> lastRelease() async {
   _checkGitDir();
   var gitDir = await GitDir.fromExisting(rootPath);
   var processResult =
-      await gitDir.runCommand(['branch', '--list', 'release_*']);
+  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_*']);
+  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;
@@ -109,7 +125,12 @@ 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 {
@@ -142,7 +163,9 @@ 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;
 }
@@ -162,7 +185,7 @@ String buildVersionNumber(BuildSpec spec) {
 
 String _nextRelease() {
   var current =
-      RegExp(r'release_(\d+)').matchAsPrefix(lastReleaseName)!.group(1);
+  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 6cf78bf738..7557bd5af9 100644
--- a/tool/plugin/lib/verify.dart
+++ b/tool/plugin/lib/verify.dart
@@ -31,12 +31,13 @@ class VerifyCommand extends ProductCommand {
       }
       log('\nverifyPlugin for $spec:');
       result =
-          await runner.runGradleCommand(['verifyPlugin'], spec, '1', 'false');
+      await runner.runGradleCommand(['verifyPlugin'], spec, '1', 'false');
       if (result != 0) {
         return result;
       }
     }
-    log('\nSummary: verification of all ${specs.length} build specifications was successful.');
+    log('\nSummary: verification of all ${specs
+        .length} build specifications was successful.');
     return result;
   }
 }
diff --git a/tool/plugin/test/plugin_test.dart b/tool/plugin/test/plugin_test.dart
index d430198814..d59d07585d 100644
--- a/tool/plugin/test/plugin_test.dart
+++ b/tool/plugin/test/plugin_test.dart
@@ -159,7 +159,7 @@ void main() {
 
     test('only-version', () async {
       ProductCommand command =
-          makeTestRunner().commands['make'] as ProductCommand;
+      makeTestRunner().commands['make'] as ProductCommand;
       var results = command.argParser.parse(['--only-version=2023.1']);
       expect(results['only-version'], '2023.1');
     });
@@ -246,8 +246,8 @@ class TestDeployCommand extends DeployCommand {
   void changeDirectory(Directory dir) {}
 
   @override
-  Future<int> upload(
-      String filePath, String pluginNumber, String token, String channel) {
+  Future<int> upload(String filePath, String pluginNumber, String token,
+      String channel) {
     paths.add(filePath);
     plugins.add(pluginNumber);
     return Future(() => 0);