Skip to content

Fix expected output in swift-format SkipUnless check #2066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2025

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Mar 14, 2025

We weren’t hitting this in Swift CI because we only test against Swift 6.2 toolchains, which take an earlier exit based on the Swift version.

We weren’t hitting this in Swift CI because we only test against Swift 6.2 toolchains, which take an earlier exit based on the Swift version.
@ahoppen
Copy link
Member Author

ahoppen commented Mar 14, 2025

@swift-ci Please test

@@ -372,8 +372,8 @@ package actor SkipUnless {
let output = try result.utf8Output()
switch output {
case "": return false
case "let x = 1": return true
default: throw GenericError("Received unexpected formatting output: \(output)")
case "let x = 1\n": return true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could just strip output?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷🏽 This check will disappear pretty quickly anyway once we no longer support building and testing SourceKit-LSP using a Swift 6.0 compiler.

@ahoppen ahoppen enabled auto-merge March 14, 2025 22:27
@ahoppen ahoppen merged commit 3cc39df into swiftlang:main Mar 15, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants