refactor(parser): Remove Lexer peeking for modifiers#11228
Merged
graphite-app[bot] merged 1 commit intomainfrom May 22, 2025
Merged
refactor(parser): Remove Lexer peeking for modifiers#11228graphite-app[bot] merged 1 commit intomainfrom
graphite-app[bot] merged 1 commit intomainfrom
Conversation
Contributor
How to use the Graphite Merge QueueAdd either label to this PR to merge it via the merge queue:
You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. |
github-actions
bot
added
A-parser
Contributor
There was a problem hiding this comment.
Pull Request Overview
Refactors the parser’s modifier lookahead logic by replacing non-destructive peek calls with direct token consumption and checks.
- Replaces
peek_kind() == Kind::Enumwithbump_any()followed byat(Kind::Enum) - Replaces
peek_at(Kind::Enum)withbump_any()followed byat(Kind::Enum)
Comments suppressed due to low confidence (2)
crates/oxc_parser/src/modifiers.rs:321
- Calling
bump_any()in a lookahead predicate mutates parser state unexpectedly. Consider usingpeek_at(Kind::Enum)or snapshotting/restoring parser position to avoid side-effects.
Kind::Const => { self.bump_any(); self.at(Kind::Enum) },
crates/oxc_parser/src/modifiers.rs:457
- This replacement also consumes the
Consttoken during a lookahead. To preserve parser state, revert to a non-destructive peek or implement position rewind after consuming.
Kind::Const => { self.bump_any(); self.at(Kind::Enum) },
CodSpeed Instrumentation Performance ReportMerging #11228 will not alter performanceComparing Summary
|
Member
Merge activity
|
Part of #11194 NOTE: In TypeScript parser.ts, `next_token_can_follow_modifier` seems to be the only place to handle these checks. https://github.com/microsoft/TypeScript/blob/b504a1eed45e35b5f54694a1e0a09f35d0a5663c/src/compiler/parser.ts#L2765 But we have two places, may revisit it later.
graphite-app
bot
force-pushed
the
r/remove-peek-modifiers
branch
from
a91ca36 to
07e6ae0
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.
Part of #11194
NOTE: In TypeScript parser.ts,
next_token_can_follow_modifierseems to be the only place to handle these checks.https://github.com/microsoft/TypeScript/blob/b504a1eed45e35b5f54694a1e0a09f35d0a5663c/src/compiler/parser.ts#L2765
But we have two places, may revisit it later.