Handle parentheses when formatting slice expressions #5882
Merged
Conversation
This file contains 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
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
konstin
force-pushed
the
Fix_slice_formatting_with_parentheses
branch
from
0634adc
to
98e8d42
Compare
PR Check ResultsEcosystem✅ ecosystem check detected no changes. BenchmarkLinuxWindows |
MichaReiser
approved these changes
Jul 19, 2023
Comment on lines
+180
to
+182
| let mut tokens = SimpleTokenizer::new(contents, TextRange::new(after_upper, range.end())) | ||
| .skip_trivia() | ||
| .skip_while(|token| token.kind == TokenKind::RParen); |
There was a problem hiding this comment.
I wonder if we should create a helper for this. It's not the first time we incorrectly assumed that there are never right parens. But I don't have a good idea of how, and this is cleary out of this PR's scope.
There was a problem hiding this comment.
An after node range search util would be nice. I did some small changes in #5885
konstin
force-pushed
the
Fix_slice_formatting_with_parentheses
branch
from
98e8d42
to
e062233
Compare
**Summary** Fix the formatter crash with `x[(1) :: ]` and related code. **Problem** For assigning comments in slices in subscripts, we need to find the positions of the colons to assign comments before and after the colon to the respective lower/upper/step node (or dangling in that section). Formatting `x[(1) :: ]` was broken because we were looking for a `:` after the `1` but didn't consider that there could be a `)` outside the range of the lower node, which contains just the `1` and no optional parentheses. **Solution** Use the simple tokenizer directly and skip all closing parentheses. **Test Plan** I added regression tests. Closes #5733
konstin
force-pushed
the
Fix_slice_formatting_with_parentheses
branch
from
e062233
to
46b65d0
Compare
konstin
added a commit
that referenced
this pull request
Jul 20, 2023
## Summary A bit more consistency inspired by #5882 (comment) ## Test Plan Existing tests (refactoring)
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.
Summary Fix the formatter crash with
x[(1) :: ]and related code.Problem For assigning comments in slices in subscripts, we need to find the positions of the colons to assign comments before and after the colon to the respective lower/upper/step node (or dangling in that section). Formatting
x[(1) :: ]was broken because we were looking for a:after the1but didn't consider that there could be a)outside the range of the lower node, which contains just the1and no optional parentheses.Solution Use the simple tokenizer directly and skip all closing parentheses.
Test Plan I added regression tests.
Closes #5733