[5.9] BasicFormat should not format unexpected nodes #1829
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
Contributor
bnbarham
commented
Jun 22, 2023
bnbarham
commented
- Explanation: Updates BasicFormat to not format unexpected nodes, which has been a constant source of new issues for swift-syntax. Also included here is Kim's patch to use HEAD For CodeGeneration + re-running it (there were a number of conflicts in the generated code and re-running codegen is far simpler than trying to fix them).
- Scope: Macro expansion formatting
- Risk: Low
- Testing: Added a test case for the unexpected case
- Original PR: BasicFormat should not format unexpected nodes #1759
`BasicFormat` depends on the parent layout nodes to determine formatting in some cases, so it doesn't make sense to visit unexpected nodes. Also fix up `SyntaxRewriter` to take a `viewMode`, since as it was `BasicFormat` was actually visiting `missing` nodes, which also doesn't make much sense. Resolves rdar://110463876. (cherry picked from commit 9227d5b)
release/5.9 was missing the CodeGeneration update to use HEAD and thus many of the generated files are out of date. Update them.
|
@swift-ci please test |
|
@ahoppen I've cherry-picked the HEAD change for CodeGeneration here. I didn't notice it in the refactoring change for some reason, even though I did re-generate there as well 🤔 |
DougGregor
approved these changes
Jun 22, 2023
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.