Recover incomplete list comprehension elements#25326
Merged
Merged
Conversation
|
403a0cf to
6c6871a
Compare
ec5db73 to
97387e5
Compare
a65d357 to
d9dd070
Compare
charliermarsh
approved these changes
May 22, 2026
d9dd070 to
7dd9401
Compare
thejchap
pushed a commit
to thejchap/ruff
that referenced
this pull request
May 23, 2026
anishgirianish
pushed a commit
to anishgirianish/ruff
that referenced
this pull request
May 28, 2026
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
Fixes astral-sh/ty#2365.
The parser eats keywords if they appear in a name position. For example, the parser's error recovery eats the
asynckeyword in:because the user could be in the middle of ty ping
asyncio.However, this behavior can sometimes be too eager and result in worse recovery. For example, if we have:
It's way more likely that the user is in the middle of typing the for target than that
inis the intended target name. This PR extends the parser recovery by intentionally leaving certain keyword tokens in place, if they're expected in this context. The ideal parse tree for the above is a for statement with a missing target.This is implemented by adding two flags to
ExpressionContextthat inform the identifier parsing to not eat afororinkeyword. This improves error recovery in comprehensions and for loops.Test Plan
Added parser tests