Various trivia-related fixes. #648
Merged
Conversation
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
…eyword.
After removing the legacy trivia workaround, we were dropping trailing
trivia on a conditional statement keyword; for example, the comment would
be lost here:
```swift
guard // here's a comment
let x = x
else {}
```
Trailing comments were being appended to the next token's leading trivia instead of staying as trailing trivia; I forgot to make this adjustment when removing the legacy trivia workaround. Interestingly, this didn't surface as a problem in either the `OrderedImports` rule's unit tests or the pretty printer unit tests. Only the interaction between the two would surface the error.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These are fixes that got missed during the removal of the legacy trivia workaround (and one issue that's been around before that):
// swift-format-ignore-fileshouldn't modify anything, even whitespace.NoParensAroundConditions: Preserve trailing trivia on the statement keyword.OrderedImports: Fix trivia placement for trailing comments.