Skip to content

refactor(parser): simplify ModifierFlags #20738

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
Mar 26, 2026
Merged

refactor(parser): simplify ModifierFlags #20738

Show file tree
Hide file tree
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
12 changes: 5 additions & 7 deletions crates/oxc_parser/src/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ trait DiagnosticExt {
impl DiagnosticExt for OxcDiagnostic {
fn with_allowed_modifier_help(self, allowed: Option<ModifierFlags>) -> Self {
if let Some(allowed) = allowed {
if allowed.is_empty() {
self.with_help("No modifiers are allowed here.")
} else if allowed.iter().count() == 1 {
self.with_help(format!("Only '{allowed}' modifier is allowed here."))
} else {
self.with_help(format!("Allowed modifiers are: {allowed}"))
match allowed.count() {
0 => self.with_help("No modifiers are allowed here."),
1 => self.with_help(format!("Only '{allowed}' modifier is allowed here.")),
_ => self.with_help(format!("Allowed modifiers are: {allowed}")),
}
} else {
self
Expand Down Expand Up @@ -972,7 +970,7 @@ pub fn accessor_modifier(modifier: &Modifier, allowed: Option<ModifierFlags>) ->
format!("'accessor' modifier cannot be used with '{}' modifier.", modifier.kind),
)
.with_label(modifier.span)
.with_allowed_modifier_help(allowed.map(|a| a - ModifierFlags::ACCESSOR))
.with_allowed_modifier_help(allowed.map(|a| a.without(ModifierKind::Accessor)))
}

#[cold]
Expand Down
77 changes: 42 additions & 35 deletions crates/oxc_parser/src/js/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {

self.verify_modifiers(
modifiers,
ModifierFlags::DECLARE | ModifierFlags::ABSTRACT,
ModifierFlags::new([ModifierKind::Declare, ModifierKind::Abstract]),
true,
diagnostics::modifier_cannot_be_used_here,
);
Expand Down Expand Up @@ -247,7 +247,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {

self.verify_modifiers(
&modifiers,
!ModifierFlags::EXPORT,
ModifierFlags::all_except([ModifierKind::Export]),
false,
diagnostics::cannot_appear_on_class_elements,
);
Expand Down Expand Up @@ -295,7 +295,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
// No modifiers except `static` and `readonly` are valid here
self.verify_modifiers(
&modifiers,
ModifierFlags::READONLY | ModifierFlags::STATIC,
ModifierFlags::new([ModifierKind::Readonly, ModifierKind::Static]),
true,
diagnostics::cannot_appear_on_an_index_signature,
);
Expand Down Expand Up @@ -323,7 +323,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
fn parse_class_element_name(&mut self, modifiers: &Modifiers<'a>) -> (PropertyKey<'a>, bool) {
self.verify_modifiers(
modifiers,
!(ModifierFlags::CONST | ModifierFlags::IN | ModifierFlags::OUT),
ModifierFlags::all_except([ModifierKind::Const, ModifierKind::In, ModifierKind::Out]),
false,
|modifier, _| {
match modifier.kind {
Expand All @@ -343,7 +343,11 @@ impl<'a, C: Config> ParserImpl<'a, C> {
if self.is_ts {
self.verify_modifiers(
modifiers,
!ModifierFlags::ACCESSIBILITY,
ModifierFlags::all_except([
ModifierKind::Public,
ModifierKind::Private,
ModifierKind::Protected,
]),
false,
diagnostics::accessibility_modifier_on_private_property,
);
Expand Down Expand Up @@ -386,11 +390,15 @@ impl<'a, C: Config> ParserImpl<'a, C> {
};
self.verify_modifiers(
modifiers,
ModifierFlags::ACCESSIBILITY
| ModifierFlags::ACCESSOR
| ModifierFlags::STATIC
| ModifierFlags::ABSTRACT
| ModifierFlags::OVERRIDE,
ModifierFlags::new([
ModifierKind::Public,
ModifierKind::Private,
ModifierKind::Protected,
ModifierKind::Accessor,
ModifierKind::Static,
ModifierKind::Abstract,
ModifierKind::Override,
]),
true,
diagnostics::accessor_modifier,
);
Expand Down Expand Up @@ -439,7 +447,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
self.check_method_definition_accessor(&method_definition);
self.verify_modifiers(
modifiers,
!(ModifierFlags::ASYNC | ModifierFlags::DECLARE),
ModifierFlags::all_except([ModifierKind::Async, ModifierKind::Declare]),
false,
diagnostics::modifier_cannot_be_used_here,
);
Expand Down Expand Up @@ -519,32 +527,31 @@ impl<'a, C: Config> ParserImpl<'a, C> {
if generator || matches!(self.cur_kind(), Kind::LParen | Kind::LAngle) {
self.verify_modifiers(
modifiers,
!(ModifierFlags::DECLARE | ModifierFlags::READONLY),
ModifierFlags::all_except([ModifierKind::Declare, ModifierKind::Readonly]),
false,
|modifier, _| match modifier.kind {
ModifierKind::Declare => diagnostics::cannot_appear_on_class_elements(
modifier,
Some(
ModifierFlags::ACCESSIBILITY
| ModifierFlags::STATIC
| ModifierFlags::ABSTRACT
| ModifierFlags::OVERRIDE
| ModifierFlags::ASYNC,
),
),
ModifierKind::Readonly => {
diagnostics::modifier_only_on_property_declaration_or_index_signature(
modifier,
Some(
ModifierFlags::ACCESSIBILITY
| ModifierFlags::STATIC
| ModifierFlags::ABSTRACT
| ModifierFlags::OVERRIDE
| ModifierFlags::ASYNC,
),
)
|modifier, _| {
const ALLOWED: ModifierFlags = ModifierFlags::new([
ModifierKind::Public,
ModifierKind::Private,
ModifierKind::Protected,
ModifierKind::Static,
ModifierKind::Abstract,
ModifierKind::Override,
ModifierKind::Async,
]);

match modifier.kind {
ModifierKind::Declare => {
diagnostics::cannot_appear_on_class_elements(modifier, Some(ALLOWED))
}
ModifierKind::Readonly => {
diagnostics::modifier_only_on_property_declaration_or_index_signature(
modifier,
Some(ALLOWED),
)
}
_ => unreachable!(),
}
_ => unreachable!(),
},
);
return self.parse_method_declaration(
Expand Down
10 changes: 8 additions & 2 deletions crates/oxc_parser/src/js/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,13 @@ impl<'a, C: Config> ParserImpl<'a, C> {
let modifiers = self.parse_modifiers(false, false);
if self.is_ts {
let allowed_modifiers = if func_kind == FunctionKind::Constructor {
ModifierFlags::ACCESSIBILITY | ModifierFlags::OVERRIDE | ModifierFlags::READONLY
ModifierFlags::new([
ModifierKind::Public,
ModifierKind::Private,
ModifierKind::Protected,
ModifierKind::Override,
ModifierKind::Readonly,
])
} else {
ModifierFlags::empty()
};
Expand Down Expand Up @@ -287,7 +293,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
}
self.verify_modifiers(
modifiers,
ModifierFlags::DECLARE | ModifierFlags::ASYNC,
ModifierFlags::new([ModifierKind::Declare, ModifierKind::Async]),
true,
diagnostics::modifier_cannot_be_used_here,
);
Expand Down
5 changes: 4 additions & 1 deletion crates/oxc_parser/src/js/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,10 @@ impl<'a, C: Config> ParserImpl<'a, C> {
let modifiers = self
.ast
.vec1(Modifier::new(self.end_span(modifier_span), ModifierKind::Abstract));
let modifiers = Modifiers::new(Some(modifiers), ModifierFlags::ABSTRACT);
let modifiers = Modifiers::new(
Some(modifiers),
ModifierFlags::new([ModifierKind::Abstract]),
);
return ExportDefaultDeclarationKind::ClassDeclaration(
self.parse_class_declaration(decl_span, &modifiers, decorators),
);
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_parser/src/js/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use oxc_syntax::operator::AssignmentOperator;
use crate::{
Context, ParserConfig as Config, ParserImpl, diagnostics,
lexer::Kind,
modifiers::{ModifierFlags, Modifiers},
modifiers::{ModifierFlags, ModifierKind, Modifiers},
};

use super::FunctionKind;
Expand Down Expand Up @@ -67,7 +67,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
if asterisk_token || matches!(self.cur_kind(), Kind::LParen | Kind::LAngle) {
self.verify_modifiers(
&modifiers,
ModifierFlags::ASYNC,
ModifierFlags::new([ModifierKind::Async]),
true,
diagnostics::modifier_cannot_be_used_here,
);
Expand Down
3 changes: 2 additions & 1 deletion crates/oxc_parser/src/js/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,8 @@ impl<'a, C: Config> ParserImpl<'a, C> {
self.bump_any();
if self.is_ts && self.at(Kind::Enum) {
let modifiers = self.ast.vec1(Modifier::new(self.end_span(span), ModifierKind::Const));
let modifiers = Modifiers::new(Some(modifiers), ModifierFlags::CONST);
let modifiers =
Modifiers::new(Some(modifiers), ModifierFlags::new([ModifierKind::Const]));
Statement::from(self.parse_ts_enum_declaration(span, &modifiers))
} else {
self.parse_variable_statement(span, VariableDeclarationKind::Const, stmt_ctx)
Expand Down
Loading
Loading