Enable trailing commas lint (#387)

Author: kevmoo

analysis_options.yaml

@@ -119,3 +119,4 @@ linter:
     - use_string_buffers
     - valid_regexps
     - void_checks
+    - require_trailing_commas

mono_repo/build.yaml

@@ -13,3 +13,7 @@ targets:
         options:
           any_map: true
           checked: true
+      source_gen:combining_builder:
+        options:
+          ignore_for_file:
+          - require_trailing_commas

mono_repo/lib/src/commands/github/github_yaml.dart

@@ -27,8 +27,9 @@ Map<String, String> generateGitHubYml(
 
   final allJobStages = {for (var job in jobs) job.stageName};
   final orderedStages = calculateOrderedStages(
-      rootConfig, rootConfig.monoConfig.githubConditionalStages)
-    ..add(_onCompletionStage);
+    rootConfig,
+    rootConfig.monoConfig.githubConditionalStages,
+  )..add(_onCompletionStage);
 
   final output = <String, String>{};
 
@@ -201,24 +202,26 @@ Iterable<_MapEntryWithStage> _listJobs(
     if (mergeStages.contains(first.job.stageName)) {
       final packages = entry.value.map((t) => t.job.package).toList()..sort();
       yield jobEntry(
-          first.jobYaml(
+        first.jobYaml(
+          rootConfig,
+          packages: packages,
+          oneOs: differentOperatingSystems.length == 1,
+          oneSdk: differentSdks.length == 1,
+          onePackage: differentPackages.length == 1,
+        ),
+        first.job.stageName,
+      );
+    } else {
+      yield* entry.value.map(
+        (e) => jobEntry(
+          e.jobYaml(
             rootConfig,
-            packages: packages,
             oneOs: differentOperatingSystems.length == 1,
             oneSdk: differentSdks.length == 1,
             onePackage: differentPackages.length == 1,
           ),
-          first.job.stageName);
-    } else {
-      yield* entry.value.map(
-        (e) => jobEntry(
-            e.jobYaml(
-              rootConfig,
-              oneOs: differentOperatingSystems.length == 1,
-              oneSdk: differentSdks.length == 1,
-              onePackage: differentPackages.length == 1,
-            ),
-            e.job.stageName),
+          e.job.stageName,
+        ),
       );
     }
   }
@@ -227,9 +230,12 @@ Iterable<_MapEntryWithStage> _listJobs(
   // appropriate `needs` config to each.
   if (onCompletionJobs != null && onCompletionJobs.isNotEmpty) {
     for (var jobConfig in onCompletionJobs) {
-      yield jobEntry({
-        ...jobConfig,
-      }, _onCompletionStage);
+      yield jobEntry(
+        {
+          ...jobConfig,
+        },
+        _onCompletionStage,
+      );
     }
   }
 }
@@ -265,24 +271,28 @@ extension on CIJobEntry {
     for (var package in packages) {
       final pubStepId = '${package.replaceAll('/', '_')}_'
           'pub_${rootConfig.monoConfig.pubAction}';
-      commandEntries.add(_CommandEntry(
-        '$package; $pubCommand',
-        pubCommand,
-        id: pubStepId,
-        // Run this regardless of the success of other steps other than the
-        // pub step.
-        ifCondition: "always() && steps.checkout.conclusion == 'success'",
-        workingDirectory: package,
-      ));
-      for (var i = 0; i < commands.length; i++) {
-        commandEntries.add(_CommandEntry(
-          '$package; ${job.tasks[i].command}',
-          _commandForOs(job.tasks[i].command),
+      commandEntries.add(
+        _CommandEntry(
+          '$package; $pubCommand',
+          pubCommand,
+          id: pubStepId,
           // Run this regardless of the success of other steps other than the
           // pub step.
-          ifCondition: "always() && steps.$pubStepId.conclusion == 'success'",
+          ifCondition: "always() && steps.checkout.conclusion == 'success'",
           workingDirectory: package,
-        ));
+        ),
+      );
+      for (var i = 0; i < commands.length; i++) {
+        commandEntries.add(
+          _CommandEntry(
+            '$package; ${job.tasks[i].command}',
+            _commandForOs(job.tasks[i].command),
+            // Run this regardless of the success of other steps other than the
+            // pub step.
+            ifCondition: "always() && steps.$pubStepId.conclusion == 'success'",
+            workingDirectory: package,
+          ),
+        );
       }
     }
 

mono_repo/lib/src/commands/mono_repo_command.dart

@@ -11,6 +11,7 @@ const recursiveFlag = 'recursive';
 
 abstract class MonoRepoCommand extends Command<void> {
   RootConfig rootConfig() => RootConfig(
-      rootDirectory: p.current,
-      recursive: globalResults![recursiveFlag] as bool);
+        rootDirectory: p.current,
+        recursive: globalResults![recursiveFlag] as bool,
+      );
 }

mono_repo/lib/src/commands/presubmit.dart

@@ -25,21 +25,31 @@ class PresubmitCommand extends MonoRepoCommand {
 
   PresubmitCommand() {
     argParser
-      ..addMultiOption('package',
-          help: 'The package(s) to run on, defaults to all packages', abbr: 'p')
-      ..addMultiOption('task',
-          help: 'The task(s) to run, defaults to all tasks', abbr: 't')
-      ..addOption('sdk',
-          help: 'Which sdk to use for match tasks, defaults to current sdk',
-          defaultsTo: _currentSdk);
+      ..addMultiOption(
+        'package',
+        help: 'The package(s) to run on, defaults to all packages',
+        abbr: 'p',
+      )
+      ..addMultiOption(
+        'task',
+        help: 'The task(s) to run, defaults to all tasks',
+        abbr: 't',
+      )
+      ..addOption(
+        'sdk',
+        help: 'Which sdk to use for match tasks, defaults to current sdk',
+        defaultsTo: _currentSdk,
+      );
   }
 
   @override
   Future<void> run() async {
-    final passed = await presubmit(rootConfig(),
-        packages: argResults!['package'] as List<String>,
-        tasks: argResults!['task'] as List<String>,
-        sdkToRun: argResults!['sdk'] as String);
+    final passed = await presubmit(
+      rootConfig(),
+      packages: argResults!['package'] as List<String>,
+      tasks: argResults!['task'] as List<String>,
+      sdkToRun: argResults!['sdk'] as String,
+    );
 
     // Set a bad exit code if it failed.
     if (!passed) exitCode = 1;
@@ -100,12 +110,14 @@ Future<bool> presubmit(
   // Status of the presubmit.
   var passed = true;
   for (var package in packages) {
-    final config = rootConfig.singleWhere((pkg) => pkg.relativePath == package,
-        orElse: () {
-      throw UserException(
-          'Unrecognized package `$package`, known packages are:\n'
-          '${rootConfig.map((pkg) => '  ${pkg.relativePath}').join('\n')}');
-    });
+    final config = rootConfig.singleWhere(
+      (pkg) => pkg.relativePath == package,
+      orElse: () {
+        throw UserException(
+            'Unrecognized package `$package`, known packages are:\n'
+            '${rootConfig.map((pkg) => '  ${pkg.relativePath}').join('\n')}');
+      },
+    );
 
     print(styleBold.wrap(package));
     for (var job in config.jobs) {
@@ -122,8 +134,11 @@ Future<bool> presubmit(
           continue;
         }
 
-        final result = await Process.run(ciScriptPath, [taskKey],
-            environment: {'PKGS': package});
+        final result = await Process.run(
+          ciScriptPath,
+          [taskKey],
+          environment: {'PKGS': package},
+        );
         if (result.exitCode == 0) {
           print(green.wrap('    success'));
         } else {

mono_repo/lib/src/commands/pub.dart

@@ -65,8 +65,12 @@ Future<void> pub(RootConfig rootConfig, List<String> args) async {
     );
     final workingDir = p.join(rootConfig.rootDirectory, dir);
 
-    final proc = await Process.start(executable, packageArgs,
-        mode: ProcessStartMode.inheritStdio, workingDirectory: workingDir);
+    final proc = await Process.start(
+      executable,
+      packageArgs,
+      mode: ProcessStartMode.inheritStdio,
+      workingDirectory: workingDir,
+    );
 
     final exit = await proc.exitCode;
 

mono_repo/lib/src/github_config.g.dart

@@ -185,7 +185,8 @@ class MonoConfig {
 /// Parses the `stages` key from a CI config map, into a Map from stage name
 /// to [ConditionalStage] instance.
 Map<String, ConditionalStage> _readConditionalStages(
-    Map<dynamic, dynamic> ciJson) {
+  Map<dynamic, dynamic> ciJson,
+) {
   final conditionalStages = <String, ConditionalStage>{};
   final rawValue = ciJson['stages'];
   if (rawValue != null) {

mono_repo/lib/src/mono_config.dart

@@ -489,7 +489,10 @@ class Task {
   }
 
   static List<String> _commandValue(
-      PackageFlavor flavor, String name, String? args) {
+    PackageFlavor flavor,
+    String name,
+    String? args,
+  ) {
     switch (name) {
       case 'format':
         return [