Avoid dropping inline comments in control_statement fixes#6545
Open
theamodhshetty wants to merge 2 commits into
Open
Avoid dropping inline comments in control_statement fixes#6545theamodhshetty wants to merge 2 commits into
theamodhshetty wants to merge 2 commits into
Conversation
2 tasks
Generated by 🚫 Danger |
Collaborator
|
Why not remove the parentheses while keeping the comment as is? |
Contributor
Author
|
Thanks, that makes sense. I pushed I also checked the same trivia path for Validation rerun:
|
SimplyDanny
requested changes
May 21, 2026
SimplyDanny
left a comment
SimplyDanny
left a comment
Collaborator
There was a problem hiding this comment.
Let's have a few more test cases. Quite a few cases are currently not covered.
| ### Bug Fixes | ||
|
|
||
| * Preserve inline comments when `control_statement` removes parentheses during | ||
| `swiftlint --fix`. |
Collaborator
There was a problem hiding this comment.
Please append two spaces to the end of the description. They are required to enforce a line break in the rendered Markdown.
Suggested change
| `swiftlint --fix`. | |
| `swiftlint --fix`. |
| if abc == 1/* && cdf == 2*/ { | ||
| print("Hello, world!") | ||
| } | ||
| """), |
Collaborator
There was a problem hiding this comment.
I wish there were more correction examples. The implementation touches much more constructs than the test examples cover.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
control_statementfrom unwrapping parenthesized conditions when the parentheses contain commentsWhy
swiftlint --fixwas deleting inline comments in cases likeif (abc == 1/* ... */) {}. This change takes the conservative path and skips those corrections instead of applying a destructive rewrite.Testing
Closes #6207