diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 9a931854cdc32..540749c9b5b33 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -2001,7 +2001,6 @@ swiftsyntax swiftsyntax-enable-rawsyntax-validation swiftsyntax-enable-test-fuzzing swiftsyntax-verify-generated-files -swiftsyntax-lint swiftformat skstresstester sourcekit-lsp @@ -2030,7 +2029,6 @@ assertions swiftsyntax swiftformat install-swiftformat -swiftsyntax-lint sourcekit-lsp-lint [preset: buildbot_swiftformat_linux] @@ -2039,7 +2037,6 @@ release assertions swiftsyntax swiftformat -swiftsyntax-lint #===------------------------------------------------------------------------===# # Test Swift Stress Tester diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py index e53dccb61bb9b..4c81e979d97c4 100644 --- a/utils/build_swift/build_swift/driver_arguments.py +++ b/utils/build_swift/build_swift/driver_arguments.py @@ -788,9 +788,6 @@ def create_argument_parser(): help='set to validate that RawSyntax layout nodes contain children of ' + 'the expected types and that RawSyntax tokens have the expected ' + 'token kinds') - option('--swiftsyntax-lint', - toggle_true('swiftsyntax_lint'), - help='verify that swift-syntax Source code is formatted correctly') option(['--install-sourcekit-lsp'], toggle_true('install_sourcekitlsp'), help='install SourceKitLSP') option(['--install-swiftformat'], toggle_true('install_swiftformat'), diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py index 5c37377c30b83..72cae0da398bf 100644 --- a/utils/build_swift/tests/expected_options.py +++ b/utils/build_swift/tests/expected_options.py @@ -122,7 +122,6 @@ 'swiftsyntax_verify_generated_files': False, 'swiftsyntax_enable_rawsyntax_validation': False, 'swiftsyntax_enable_test_fuzzing': False, - 'swiftsyntax_lint': False, 'install_playgroundsupport': False, 'install_sourcekitlsp': False, 'install_swiftformat': False, @@ -667,8 +666,6 @@ class BuildScriptImplOption(_BaseOption): dest='swiftsyntax_enable_rawsyntax_validation'), EnableOption('--swiftsyntax-enable-test-fuzzing', dest='swiftsyntax_enable_test_fuzzing'), - EnableOption('--swiftsyntax-lint', - dest='swiftsyntax_lint'), EnableOption('--install-swiftpm', dest='install_swiftpm'), EnableOption('--install-swift-driver', dest='install_swift_driver'), EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'), diff --git a/utils/swift_build_support/swift_build_support/products/swiftformat.py b/utils/swift_build_support/swift_build_support/products/swiftformat.py index a17441fb55615..0a1185b0d37bc 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftformat.py +++ b/utils/swift_build_support/swift_build_support/products/swiftformat.py @@ -103,39 +103,9 @@ def should_build(self, host_target): def build(self, host_target): self.run_build_script_helper('build', host_target) - if self.args.swiftsyntax_lint: - self.lint_swiftsyntax(host_target) if self.args.sourcekitlsp_lint: self.lint_sourcekitlsp() - def lint_swiftsyntax(self, host_target): - swift_exec = os.path.join( - self.install_toolchain_path(host_target), - 'bin', - 'swift' - ) - swift_syntax_dev_utils_dir = os.path.join( - os.path.dirname(self.source_dir), - 'swift-syntax', - 'SwiftSyntaxDevUtils' - ) - swift_format_exec = os.path.join( - self.build_dir, - self.configuration(), - 'swift-format' - ) - linting_cmd = [ - swift_exec, - 'run', - '--package-path', swift_syntax_dev_utils_dir, - 'swift-syntax-dev-utils', - 'format', - '--verbose', - '--lint', - '--swift-format', swift_format_exec - ] - shell.call(linting_cmd, env={'SWIFTCI_USE_LOCAL_DEPS': '1'}) - def lint_sourcekitlsp(self): linting_cmd = [ os.path.join(self.build_dir, self.configuration(), 'swift-format'),