Skip to content

refactor(parser): Consolidate export type lookahead() calls #11341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
May 28, 2025
Merged

refactor(parser): Consolidate export type lookahead() calls #11341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 26 additions & 28 deletions crates/oxc_parser/src/js/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,24 +279,25 @@ impl<'a> ParserImpl<'a> {
Kind::LCurly => {
ModuleDeclaration::ExportNamedDeclaration(self.parse_export_named_specifiers(span))
}
Kind::Type
if self.is_ts
&& self.lookahead(|p| {
p.bump_any();
p.at(Kind::LCurly)
}) =>
{
// `export type { ...`
ModuleDeclaration::ExportNamedDeclaration(self.parse_export_named_specifiers(span))
}
Kind::Type
if self.lookahead(|p| {
p.bump_any();
p.at(Kind::Star)
}) =>
{
// `export type * as ...`
ModuleDeclaration::ExportAllDeclaration(self.parse_export_all_declaration(span))
Kind::Type if self.is_ts => {
let checkpoint = self.checkpoint();
self.bump_any();
let next_kind = self.cur_kind();
self.rewind(checkpoint);

match next_kind {
// `export type { ...`
Kind::LCurly => ModuleDeclaration::ExportNamedDeclaration(
self.parse_export_named_specifiers(span),
),
// `export type * as ...`
Kind::Star => ModuleDeclaration::ExportAllDeclaration(
self.parse_export_all_declaration(span),
),
_ => ModuleDeclaration::ExportNamedDeclaration(
self.parse_export_named_declaration(span),
),
}
}
_ => {
ModuleDeclaration::ExportNamedDeclaration(self.parse_export_named_declaration(span))
Expand Down Expand Up @@ -595,24 +596,21 @@ impl<'a> ParserImpl<'a> {
return ImportOrExportKind::Value;
}

let next_token = {
let checkpoint = self.checkpoint();
self.bump_any();
let next_token = self.cur_token();
self.rewind(checkpoint);
next_token
};
let checkpoint = self.checkpoint();
self.bump_any();
let next_kind = self.cur_kind();
self.rewind(checkpoint);

if matches!(next_token.kind(), Kind::LCurly | Kind::Star) {
if matches!(next_kind, Kind::LCurly | Kind::Star) {
self.bump_any();
return ImportOrExportKind::Type;
}

if !(next_token.kind() == Kind::Ident) && !next_token.kind().is_contextual_keyword() {
if !(next_kind == Kind::Ident) && !next_kind.is_contextual_keyword() {
return ImportOrExportKind::Value;
}

if next_token.kind() != Kind::From
if next_kind != Kind::From
|| self.lookahead(|p| {
p.bump_any();
p.bump_any();
Expand Down
Loading