Do not include newline for unterminated string range#12017
Merged
dhruvmanila merged 1 commit intomainfrom Jun 25, 2024
Merged
Conversation
Contributor
|
MichaReiser
approved these changes
Jun 25, 2024
Member
MichaReiser
left a comment
There was a problem hiding this comment.
That makes sense, even without the requirement. The string literal would also end before the newline if it is correctly quoted.
e7cb731 to
a92f5e0
Compare
dhruvmanila
added a commit
that referenced
this pull request
Jun 25, 2024
## Summary This PR updates the parser test infrastructure to validate the token ranges. From the code documentation: ``` /// Verifies that: /// * the ranges are strictly increasing when loop the tokens in insertion order /// * all ranges are within the length of the source code ``` Follow-up from #12016 and #12017 resolves: #11938 ## Test Plan Make sure that there are no failures.
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
2 participants
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 PR updates the unterminated string error range to not include the final newline character.
This is a follow-up to #12016 and required for #12019
This is not done for when the unterminated string goes till the end of file (not a newline character). The unterminated f-string range is correct.
Why is this required for #12019 ?
Because otherwise the token ranges will overlap. For example:
Here, the re-lexing logic recovers from an unterminated f-string and thus emitting a
Newlinetoken for the one at the end of the first line. But, currently theUnknownand theNewlinetoken would overlap because theUnknowntoken (unterminated string literal) range would include the newline character.Test Plan
Update and validate the snapshot.