Skip to content

Commit 4359a66

Browse files
committed
fix(parser): reject TypeScript class modifiers in JavaScript (#27312)
Reject TypeScript-only class member modifiers in JavaScript with TS8009. Valid JavaScript modifiers and members named `declare`, `override`, or `readonly` remain accepted. Reuse the existing modifier validation and storage, retaining its deduplication and keyword-span behavior. Coverage fixtures and updated conformance snapshots cover ordinary, repeated, and escaped modifiers. fixes #27290 closes #27294
1 parent 335ce79 commit 4359a66

16 files changed

Lines changed: 208 additions & 18 deletions

‎crates/oxc_parser/src/diagnostics.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,11 @@ parser_diagnostics! {
11971197
ts_error("5087", "A labeled tuple element is declared as rest with a '...' before the name, rather than before the type.").with_label(span)
11981198
};
11991199

1200+
modifier_in_ts(kind: ModifierKind, span: Span) => {
1201+
ts_error("8009", format!("The '{kind}' modifier can only be used in TypeScript files."))
1202+
.with_label(span)
1203+
};
1204+
12001205
parameter_modifiers_in_ts(modifier: Modifier, allowed: Option<ModifierKinds>) => {
12011206
ts_error("8012", "Parameter modifiers can only be used in TypeScript files.")
12021207
.with_label(modifier.span())

‎crates/oxc_parser/src/js/class.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,20 @@ impl<'a, C: Config> ParserImpl<'a, C> {
267267
false,
268268
diagnostics::cannot_appear_on_class_elements,
269269
);
270+
if !parser.is_ts {
271+
parser.verify_modifiers(
272+
modifiers,
273+
ModifierKinds::new([
274+
ModifierKind::Export,
275+
ModifierKind::Default,
276+
ModifierKind::Static,
277+
ModifierKind::Async,
278+
ModifierKind::Accessor,
279+
]),
280+
false,
281+
|modifier, _| diagnostics::modifier_in_ts(modifier.kind, modifier.span()),
282+
);
283+
}
270284
}
271285

272286
let start = self.cur_start();
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class A {
2+
declare y;
3+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
class A {
2+
pr\u0069vate x;
3+
publ\u0069c f() {}
4+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class A {
2+
private g() {}
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class A {
2+
protected f() {}
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class A {
2+
readonly x = 1;
3+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class A {
2+
private private x = 1;
3+
public public f() {}
4+
readonly readonly y = 1;
5+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
class A {
2+
declare() {}
3+
override() {}
4+
readonly() {}
5+
6+
accessor value = 1;
7+
static field = 1;
8+
async method() {}
9+
}
10+
11+
class B {
12+
declare = 1;
13+
override = 1;
14+
readonly = 1;
15+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
codegen_misc Summary:
2-
AST Parsed : 112/112 (100.00%)
3-
Positive Passed: 112/112 (100.00%)
2+
AST Parsed : 113/113 (100.00%)
3+
Positive Passed: 113/113 (100.00%)

0 commit comments

Comments
 (0)