Fix trivia transfer bugs for freestanding expression macros #2048
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
|
@swift-ci Please test |
bnbarham
approved these changes
Aug 11, 2023
ahoppen
force-pushed
the
ahoppen/incrorrect-trivia-wrapping
branch
from
9f0e185 to
486b5c2
Compare
|
@swift-ci Please test |
|
@bnbarham I removed the entire comment-handling logic altogether because it wasn’t really working as I intended and it didn’t match what the “Inline Macro” refactoring does. Could you take another look at this PR? |
|
@swift-ci Please test Windows |
|
So IIUC we leave the trivia and pass it through now? |
bnbarham
reviewed
Aug 11, 2023
| /// freestanding macro that separate it from the previous declarations. | ||
| /// We need to do this because we are replacing the entire macro expansion | ||
| /// declaration / expression with the expanded source but the “Inline Macro” | ||
| /// refactoring only replaces the node’s content, and doesn’t touch its trivia. | ||
| func wrappingInNonCommentTrivia(from node: some SyntaxProtocol) -> String { |
There was a problem hiding this comment.
Still called wrappingInNonCommentTrivia. I don't think it's necessary to mention inline macro here. There's no reason we couldn't change it as well.
There was a problem hiding this comment.
Thanks for catching these things, as always
bnbarham
approved these changes
Aug 11, 2023
ahoppen
force-pushed
the
ahoppen/incrorrect-trivia-wrapping
branch
from
486b5c2 to
6b6b157
Compare
bnbarham
approved these changes
Aug 11, 2023
There were two bugs in the way we transferred trivia from the original macro expansion expression to the expanded expression. 1. We were attaching the stripped leading trivia to the end of the node 2. We weren’t resetting the `lineContainedComment` and `lineContainedNonWhitespaceNonComment` variables when seeing a newline in a comment-only line (1) is easy to fix. For (2), I just remove the entire comment-handling logic because it didn’t match what “Inline Macro” was doing anyway. rdar://113639097
ahoppen
force-pushed
the
ahoppen/incrorrect-trivia-wrapping
branch
from
6b6b157 to
5824002
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
1 similar comment
|
@swift-ci Please test Windows |
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.
There were two bugs in the way we transferred trivia from the original macro expansion expression to the expanded expression.
lineContainedCommentandlineContainedNonWhitespaceNonCommentvariables when seeing a newline in a comment-only linerdar://113639097