Bugfix/comment duplication#5913
Merged
calebcartwright merged 3 commits intorust-lang:masterfrom Sep 20, 2023
Merged
Conversation
calebcartwright
requested changes
Sep 16, 2023
Member
calebcartwright
left a comment
There was a problem hiding this comment.
Thanks for the PR! You've definitely identified the root cause, as well as the proper underlying technique to address the issue.
However, this is such a common type of occurrence that we've got existing utilities that can and should be reused here instead. Details linked below, but basically using our span() instead of the AST struct's span field will cover the inline logic you originally proposed
Lines 43 to 55 in da7f678
Co-authored-by: Caleb Cartwright <calebcartwright@users.noreply.github.com>
Contributor
Author
|
That did the trick 😄 |
ytmimi
approved these changes
Sep 20, 2023
Contributor
ytmimi
left a comment
There was a problem hiding this comment.
Thanks for making the changes @calebcartwright asked for. I think we're good to go here!
Member
|
Thanks for fixing this and for your first contribution! |
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
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.
Fixes #5871
The issue was in the
rewrite_parenfunction.Since the span on expressions doesn't include attributes and attributes comes before the expression, this caused the attribute to be included in
pre_commentsince the end of the comment span wassubexpr.span.lo().I changed the logic to use the span of the first attribute, if there are any attributes present. If not, default to the expression span.