Skip to content

Commit

Permalink
fix(codegen): print let[0] as (let)[0] (#5947)
Browse files Browse the repository at this point in the history
  • Loading branch information
Boshen committed Sep 21, 2024
1 parent 7085829 commit 1fd38ea
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 26 deletions.
34 changes: 8 additions & 26 deletions crates/oxc_codegen/src/gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use oxc_ast::ast::*;
use oxc_span::GetSpan;
use oxc_syntax::{
identifier::{LS, PS},
keyword::is_reserved_keyword_or_global_object,
operator::UnaryOperator,
precedence::{GetPrecedence, Precedence},
};
Expand Down Expand Up @@ -1322,7 +1321,11 @@ impl<'a> GenExpr for MemberExpression<'a> {

impl<'a> GenExpr for ComputedMemberExpression<'a> {
fn gen_expr(&self, p: &mut Codegen, _precedence: Precedence, ctx: Context) {
self.object.print_expr(p, Precedence::Prefix, ctx.intersection(Context::FORBID_CALL));
// `(let[0] = 100);` -> `(let)[0] = 100`;
let wrap = self.object.get_identifier_reference().is_some_and(|r| r.name == "let");
p.wrap(wrap, |p| {
self.object.print_expr(p, Precedence::Prefix, ctx.intersection(Context::FORBID_CALL));
});
if self.optional {
p.print_str("?.");
}
Expand Down Expand Up @@ -1749,31 +1752,10 @@ impl<'a> GenExpr for ConditionalExpression<'a> {

impl<'a> GenExpr for AssignmentExpression<'a> {
fn gen_expr(&self, p: &mut Codegen, precedence: Precedence, ctx: Context) {
// Destructuring assignment
let n = p.code_len();

let identifier_is_keyword = match &self.left {
AssignmentTarget::AssignmentTargetIdentifier(target) => {
is_reserved_keyword_or_global_object(target.name.as_str())
}
AssignmentTarget::ComputedMemberExpression(expression) => match &expression.object {
Expression::Identifier(ident) => {
is_reserved_keyword_or_global_object(ident.name.as_str())
}
_ => false,
},
AssignmentTarget::StaticMemberExpression(expression) => {
is_reserved_keyword_or_global_object(expression.property.name.as_str())
}
AssignmentTarget::PrivateFieldExpression(expression) => {
is_reserved_keyword_or_global_object(expression.field.name.as_str())
}
_ => false,
};

let wrap = ((p.start_of_stmt == n || p.start_of_arrow_expr == n)
&& matches!(self.left, AssignmentTarget::ObjectAssignmentTarget(_)))
|| identifier_is_keyword;
// Destructuring assignments must be parenthesized
let wrap = (p.start_of_stmt == n || p.start_of_arrow_expr == n)
&& matches!(self.left, AssignmentTarget::ObjectAssignmentTarget(_));
p.wrap(wrap || precedence >= self.precedence(), |p| {
self.left.print(p, ctx);
p.print_soft_space();
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_codegen/tests/integration/unit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ fn comma() {

#[test]
fn assignment() {
test("(let[0] = 100);", "(let)[0] = 100;\n");
test_minify("a = b ? c : d", "a=b?c:d;");
test_minify("[a,b] = (1, 2)", "[a,b]=(1,2);");
// `{a,b}` is a block, must wrap the whole expression to be an assignment expression
Expand Down

0 comments on commit 1fd38ea

Please sign in to comment.