Use empty range when there's "gap" in token source#11032
Merged
dhruvmanila merged 1 commit intomainfrom Apr 19, 2024
Merged
Conversation
Contributor
|
| code | total | + violation | - violation | + fix | - fix |
|---|---|---|---|---|---|
| E999 | 1 | 0 | 1 | 0 | 0 |
Formatter (stable)
✅ ecosystem check detected no format changes.
Formatter (preview)
✅ ecosystem check detected no format changes.
MichaReiser
approved these changes
Apr 19, 2024
Comment on lines
+264
to
+268
| // It's possible during error recovery that the parsing didn't consume any tokens. In that | ||
| // case, `last_token_end` still points to the end of the previous token but `start` is the | ||
| // start of the current token. Calling `TextRange::new(start, self.last_token_end)` would | ||
| // panic in that case because `start > end`. This path "detects" this case and creates an | ||
| // empty range instead. |
Member
There was a problem hiding this comment.
Nit: i think this is specific to error recovery and instead is true for all "empty" nodes that don't consist of any tokens?
If that's the case, then I think we can remove the missing_node_range method that was only added to handle empty node ranges.
Member
Author
There was a problem hiding this comment.
I think missing_node_range is still useful in places where you don't have the start value or rather the start value itself is the current token start.
6979dad to
337f16e
Compare
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.
Summary
This fixes a bug where the parser would panic when there is a "gap" in
the token source.
What's a gap?
The reason it's
<=instead of just==is because there could be whitespaces betweenthe two tokens. For example:
Or, there could tokens that are considered "trivia" and thus aren't emitted by the token
source. These are comments and non-logical newlines. For example:
In either of the above cases, there's a "gap" between the end of the last token and start
of the current token.
Test Plan
Add test cases and update the snapshots.