Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions crates/oxc_parser/src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,17 @@ pub fn constructor_generator(span: Span) -> OxcDiagnostic {
OxcDiagnostic::error("Constructor can't be a generator").with_label(span)
}

#[cold]
pub fn declare_constructor(span: Span) -> OxcDiagnostic {
ts_error("1031", "'declare' modifier cannot appear on a constructor declaration.")
.with_label(span)
}

#[cold]
pub fn constructor_return_type(span: Span) -> OxcDiagnostic {
ts_error("1093", "Type annotation cannot appear on a constructor declaration.").with_label(span)
}

#[cold]
pub fn field_constructor(span: Span) -> OxcDiagnostic {
OxcDiagnostic::error("Classes can't have a field named 'constructor'").with_label(span)
Expand Down
9 changes: 9 additions & 0 deletions crates/oxc_parser/src/js/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,10 @@ impl<'a> ParserImpl<'a> {
modifiers: &Modifiers<'a>,
decorators: Vec<'a, Decorator<'a>>,
) -> ClassElement<'a> {
if let Some(modifier) = modifiers.iter().find(|m| m.kind == ModifierKind::Declare) {
self.error(diagnostics::declare_constructor(modifier.span));
}

let value = self.parse_method(
modifiers.contains(ModifierKind::Async),
false,
Expand Down Expand Up @@ -776,5 +780,10 @@ impl<'a> ParserImpl<'a> {
// class Foo { constructor<T>(param: T ) {} }
self.error(diagnostics::ts_constructor_type_parameter(type_sig.span));
}
if method.value.body.is_some()
&& let Some(return_type) = &method.value.return_type
{
self.error(diagnostics::constructor_return_type(return_type.span));
}
}
}
22 changes: 17 additions & 5 deletions tasks/coverage/snapshots/parser_typescript.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ commit: f5ccf434
parser_typescript Summary:
AST Parsed : 9844/9845 (99.99%)
Positive Passed: 9836/9845 (99.91%)
Negative Passed: 1498/2549 (58.77%)
Negative Passed: 1500/2549 (58.85%)
Expect Syntax Error: tasks/coverage/typescript/tests/cases/compiler/FunctionDeclaration3.ts

Expect Syntax Error: tasks/coverage/typescript/tests/cases/compiler/FunctionDeclaration4.ts
Expand Down Expand Up @@ -1746,12 +1746,8 @@ Expect Syntax Error: tasks/coverage/typescript/tests/cases/conformance/parser/ec

Expect Syntax Error: tasks/coverage/typescript/tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts

Expect Syntax Error: tasks/coverage/typescript/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration10.ts

Expect Syntax Error: tasks/coverage/typescript/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration2.ts

Expect Syntax Error: tasks/coverage/typescript/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration4.ts

Expect Syntax Error: tasks/coverage/typescript/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts

Expect Syntax Error: tasks/coverage/typescript/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration3.d.ts
Expand Down Expand Up @@ -21409,6 +21405,14 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/statements/Va
3 β”‚ }
╰────

Γ— TS(1093): Type annotation cannot appear on a constructor declaration.
╭─[typescript/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration10.ts:2:16]
1 β”‚ class C {
2 β”‚ constructor(): number { }
Β· ────────
3 β”‚ }
╰────

Γ— TS(1098): Type parameter list cannot be empty.
╭─[typescript/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts:2:14]
1 β”‚ class C {
Expand All @@ -21434,6 +21438,14 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/statements/Va
3 β”‚ }
╰────

Γ— TS(1031): 'declare' modifier cannot appear on a constructor declaration.
╭─[typescript/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration4.ts:2:3]
1 β”‚ class C {
2 β”‚ declare constructor() { }
Β· ───────
3 β”‚ }
╰────

Γ— TS(1028): Accessibility modifier already seen.
╭─[typescript/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration6.ts:2:10]
1 β”‚ class C {
Expand Down
Loading