Review edits

.ci.yaml

@@ -1147,6 +1147,10 @@ targets:
         {
           "CHANNEL": "master"
         }
+      dependencies: >
+        [
+          {"dependency": "swift_format", "version": "build_id:8797338979890974865"}
+        ]
 
   - name: Mac_arm64 custom_package_tests stable
     recipe: packages/packages
@@ -1160,6 +1164,10 @@ targets:
         {
           "CHANNEL": "stable"
         }
+      dependencies: >
+        [
+          {"dependency": "swift_format", "version": "build_id:8797338979890974865"}
+        ]
 
   ### iOS tasks ###
   # ios_platform_tests builds all the packages on ARM, so this build is run

.ci/targets/repo_checks.yaml

@@ -4,7 +4,8 @@ tasks:
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: format
     script: script/tool_runner.sh
-    args: ["format", "--fail-on-change"]
+    # Skip Swift formatting on Linux builders.
+    args: ["format", "--fail-on-change", "--no-swift"]
     always: true
   - name: license validation
     script: script/tool_runner.sh

script/tool/lib/src/format_command.dart

@@ -54,7 +54,8 @@ class FormatCommand extends PackageCommand {
     argParser.addFlag(_kotlinArg,
         help: 'Format Kotlin files', defaultsTo: true);
     argParser.addFlag(_javaArg, help: 'Format Java files', defaultsTo: true);
-    argParser.addFlag(_swiftArg, help: 'Format and lint Swift files');
+    argParser.addFlag(_swiftArg,
+        help: 'Format and lint Swift files', defaultsTo: true);
     argParser.addOption(_clangFormatPathArg,
         defaultsTo: 'clang-format', help: 'Path to "clang-format" executable.');
     argParser.addOption(_javaPathArg,
@@ -178,8 +179,7 @@ class FormatCommand extends PackageCommand {
   }
 
   Future<void> _formatAndLintSwift(Iterable<String> files) async {
-    // Do not format generated files. Consider removing this filter
-    // when pigeon Swift generation matches swift-format.
+    // TODO(jmagman): Remove generated file filter when pigeon Swift generation matches swift-format.
     // https://github.com/flutter/flutter/issues/141799
     final Iterable<String> swiftFiles = _filterGeneratedFiles(
         _getPathsWithExtensions(files, <String>{'.swift'}));

script/tool/test/format_command_test.dart

@@ -589,7 +589,7 @@ void main() {
       expect(processRunner.recordedCalls, orderedEquals(<ProcessCall>[]));
     });
 
-    test('skips Swift if --swift flag is not provided', () async {
+    test('skips Swift if --no-swift flag is provided', () async {
       const List<String> files = <String>[
         'macos/foo.swift',
       ];
@@ -599,7 +599,7 @@ void main() {
         extraFiles: files,
       );
 
-      await runCapturingPrint(runner, <String>['format']);
+      await runCapturingPrint(runner, <String>['format', '--no-swift']);
 
       expect(processRunner.recordedCalls, orderedEquals(<ProcessCall>[]));
     });