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
5 changes: 5 additions & 0 deletions crates/oxc_parser/src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,11 @@ pub fn private_in_private(span: Span) -> OxcDiagnostic {
OxcDiagnostic::error("Unexpected right-hand side of private-in expression").with_label(span)
}

#[cold]
pub fn unexpected_private_identifier(span: Span) -> OxcDiagnostic {
OxcDiagnostic::error("Unexpected private identifier").with_label(span)
}

#[cold]
pub fn import_arguments(span: Span) -> OxcDiagnostic {
OxcDiagnostic::error("Dynamic imports can only accept a module specifier and an optional set of attributes as arguments").with_label(span)
Expand Down
30 changes: 22 additions & 8 deletions crates/oxc_parser/src/js/expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,27 @@ impl<'a> ParserImpl<'a> {
self.ast.private_identifier(span, name)
}

/// [+In] PrivateIdentifier in ShiftExpression[?Yield, ?Await]
fn parse_private_in_expression(
&mut self,
lhs_span: u32,
lhs_precedence: Precedence,
) -> Expression<'a> {
let left = self.parse_private_identifier();
// Check if `in` operator precedence is allowed at current level.
// For `1 + #a in b`, when parsing RHS of `+`, lhs_precedence is `Add` which is
// higher than `Compare` (the precedence of `in`), so `#a in` cannot be parsed here.
if lhs_precedence >= Precedence::Compare {
return self.fatal_error(diagnostics::unexpected_private_identifier(left.span));
}
self.expect(Kind::In);
let right = self.parse_binary_expression_or_higher(Precedence::Compare);
if let Expression::PrivateInExpression(private_in_expr) = right {
return self.fatal_error(diagnostics::private_in_private(private_in_expr.span));
}
self.ast.expression_private_in(self.end_span(lhs_span), left, right)
}

/// Section [Primary Expression](https://tc39.es/ecma262/#sec-primary-expression)
/// `PrimaryExpression`[Yield, Await] :
/// this
Expand Down Expand Up @@ -1143,14 +1164,7 @@ impl<'a> ParserImpl<'a> {
let lhs_parenthesized = self.at(Kind::LParen);
// [+In] PrivateIdentifier in ShiftExpression[?Yield, ?Await]
let lhs = if self.ctx.has_in() && self.at(Kind::PrivateIdentifier) {
let left = self.parse_private_identifier();
self.expect(Kind::In);
let right = self.parse_binary_expression_or_higher(Precedence::Compare);
if let Expression::PrivateInExpression(private_in_expr) = right {
let error = diagnostics::private_in_private(private_in_expr.span);
return self.fatal_error(error);
}
self.ast.expression_private_in(self.end_span(lhs_span), left, right)
self.parse_private_in_expression(lhs_span, lhs_precedence)
} else {
let has_pure_comment = self.lexer.trivia_builder.previous_token_has_pure_comment();
let mut expr = self.parse_unary_expression_or_higher(lhs_span);
Expand Down
30 changes: 17 additions & 13 deletions tasks/coverage/snapshots/parser_babel.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ commit: fc58af40
parser_babel Summary:
AST Parsed : 2224/2230 (99.73%)
Positive Passed: 2207/2230 (98.97%)
Negative Passed: 1648/1697 (97.11%)
Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/es2022/private-in/invalid-private-followed-by-in-2/input.js

Negative Passed: 1649/1697 (97.17%)
Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/es2026/explicit-resource-management/invalid-for-using-of-no-initializer/input.js

Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/estree/class-private-property/typescript-invalid-abstract/input.ts
Expand Down Expand Up @@ -7370,12 +7368,11 @@ Expect to Parse: tasks/coverage/babel/packages/babel-parser/test/fixtures/typesc
Β· ────────────────
╰────

Γ— Expected `in` but found `(`
╭─[babel/packages/babel-parser/test/fixtures/es2022/class-private-methods/asi-failure-generator/input.js:3:7]
Γ— Unexpected private identifier
╭─[babel/packages/babel-parser/test/fixtures/es2022/class-private-methods/asi-failure-generator/input.js:3:4]
2 β”‚ p = x
3 β”‚ *#m () {}
Β· ┬
Β· ╰── `in` expected
Β· ──
4 β”‚ }
╰────

Expand Down Expand Up @@ -8538,14 +8535,22 @@ Expect to Parse: tasks/coverage/babel/packages/babel-parser/test/fixtures/typesc
╰────
help: Did you mean `export { "吾道一δ»₯貫之。" as "忠恕。" } from 'some-module'`?

Γ— Unexpected right-hand side of private-in expression
Γ— Unexpected private identifier
╭─[babel/packages/babel-parser/test/fixtures/es2022/private-in/invalid-private-followed-by-in-1/input.js:5:11]
4 β”‚ method() {
5 β”‚ #a in #b in c
Β· ───────
Β· ──
6 β”‚ }
╰────

Γ— Unexpected private identifier
╭─[babel/packages/babel-parser/test/fixtures/es2022/private-in/invalid-private-followed-by-in-2/input.js:4:9]
3 β”‚ method() {
4 β”‚ 1 + #a in b
Β· ──
5 β”‚ }
╰────

Γ— Unexpected token
╭─[babel/packages/babel-parser/test/fixtures/es2022/private-in/invalid-private-followed-by-in-3/input.js:5:18]
4 β”‚ method() {
Expand All @@ -8571,12 +8576,11 @@ Expect to Parse: tasks/coverage/babel/packages/babel-parser/test/fixtures/typesc
5 β”‚ }
╰────

Γ— Expected `in` but found `;`
╭─[babel/packages/babel-parser/test/fixtures/es2022/private-in/private-binary-expression-right/input.js:4:11]
Γ— Unexpected private identifier
╭─[babel/packages/babel-parser/test/fixtures/es2022/private-in/private-binary-expression-right/input.js:4:9]
3 β”‚ test() {
4 β”‚ 1 + #x;
Β· ┬
Β· ╰── `in` expected
Β· ──
5 β”‚ }
╰────

Expand Down
4 changes: 2 additions & 2 deletions tasks/coverage/snapshots/parser_test262.snap
Original file line number Diff line number Diff line change
Expand Up @@ -18123,11 +18123,11 @@ Negative Passed: 4581/4581 (100.00%)
Β· ───────────
╰────

Γ— Unexpected right-hand side of private-in expression
Γ— Unexpected private identifier
╭─[test262/test/language/expressions/in/private-field-in-nested.js:26:15]
25 β”‚ constructor() {
26 β”‚ #field in #field in this;
Β· ──────────────
Β· ──────
27 β”‚ }
╰────

Expand Down
12 changes: 6 additions & 6 deletions tasks/coverage/snapshots/parser_typescript.snap
Original file line number Diff line number Diff line change
Expand Up @@ -14345,12 +14345,12 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/statements/Va
26 β”‚
╰────

Γ— Cannot assign to this expression
╭─[typescript/tests/cases/conformance/classes/members/privateNames/privateNameInInExpressionTransform.ts:29:9]
28 β”‚ invalidLHS(v: any) {
29 β”‚ 'prop' in v = 10;
Β· ───────────
30 β”‚ #field in v = 10;
Γ— Unexpected private identifier
╭─[typescript/tests/cases/conformance/classes/members/privateNames/privateNameInInExpressionTransform.ts:20:14]
19 β”‚
20 β”‚ v << #field in v << v; // Good precedence (SyntaxError): (v << #field) in (v << v)
Β· ──────
21 β”‚
╰────

Γ— Unexpected token
Expand Down
Loading