Changes for review:

- Fix extra space in build-script arg to build swift-format.
- Fix python lint errors in `swiftformat.py`.
- Remove swiftsyntax from swiftformat build preset.

Author: dylansturg

utils/build-presets.ini

@@ -1709,16 +1709,12 @@ swiftsyntax-verify-generated-files
 mixin-preset=mixin_swiftpm_package_macos_platform
 release
 assertions
-swiftsyntax
-skip-test-swiftsyntax
 swiftformat
 
 [preset: buildbot_swiftformat_linux]
 mixin-preset=mixin_swiftpm_package_linux_platform
 release
 assertions
-swiftsyntax
-skip-test-swiftsyntax
 swiftformat
 
 #===------------------------------------------------------------------------===#

utils/build_swift/build_swift/driver_arguments.py

@@ -572,7 +572,7 @@ def create_argument_parser():
     option(['--skstresstester'], store_true('build_skstresstester'),
            help='build the SourceKit stress tester')
 
-    option(['--swiftformat '], store_true('build_swiftformat'),
+    option(['--swiftformat'], store_true('build_swiftformat'),
            help='build swift-format')
 
     option(['--swiftevolve'], store_true('build_swiftevolve'),

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -27,8 +27,8 @@
 from .sourcekitlsp import SourceKitLSP
 from .swift import Swift
 from .swiftevolve import SwiftEvolve
-from .swiftinspect import SwiftInspect
 from .swiftformat import SwiftFormat
+from .swiftinspect import SwiftInspect
 from .swiftpm import SwiftPM
 from .swiftsyntax import SwiftSyntax
 from .tensorflow import TensorFlowSwiftAPIs
@@ -49,8 +49,8 @@
     'PlaygroundSupport',
     'PythonKit',
     'Swift',
-    'SwiftInspect',
     'SwiftFormat',
+    'SwiftInspect',
     'SwiftPM',
     'TensorFlowSwiftAPIs',
     'XCTest',

utils/swift_build_support/swift_build_support/products/swiftformat.py

@@ -11,7 +11,6 @@
 # ----------------------------------------------------------------------------
 
 import os
-import platform
 
 from build_swift.build_swift.constants import MULTIROOT_DATA_FILE_PATH
 
@@ -57,7 +56,7 @@ def run_build_script_helper(self, action, additional_params=[]):
             script_path,
             action,
             '--toolchain', self.install_toolchain_path(),
-            '--config', configuration,
+            '--configuration', configuration,
             '--build-path', self.build_dir,
             '--multiroot-data-file', MULTIROOT_DATA_FILE_PATH,
             # There might have been a Package.resolved created by other builds