Skip to content

refactor(transformer/using): shorten AstBuilder calls #9674

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 11, 2025
Merged

refactor(transformer/using): shorten AstBuilder calls #9674

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
39 changes: 15 additions & 24 deletions crates/oxc_transformer/src/proposals/explicit_resource_management.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,29 +319,23 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {
_ => decl.into_expression(),
};

inner_block.push(Statement::VariableDeclaration(ctx.ast.alloc(
ctx.ast.variable_declaration(
inner_block.push(Statement::VariableDeclaration(
ctx.ast.alloc_variable_declaration(
span,
VariableDeclarationKind::Var,
ctx.ast.vec1(ctx.ast.variable_declarator(
span,
VariableDeclarationKind::Var,
ctx.ast.binding_pattern(
BindingPatternKind::BindingIdentifier(
ctx.ast.alloc(var_id.create_binding_identifier(ctx)),
),
NONE,
false,
),
var_id.create_binding_pattern(ctx),
Some(expr),
false,
)),
false,
),
)));
));

program_body.push(Statement::ExportNamedDeclaration(ctx.ast.alloc(
ctx.ast.export_named_declaration(
program_body.push(Statement::ExportNamedDeclaration(
ctx.ast.alloc_export_named_declaration(
SPAN,
None,
ctx.ast.vec1(ctx.ast.export_specifier(
Expand All @@ -356,7 +350,7 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {
ImportOrExportKind::Value,
NONE,
),
)));
));
}
Statement::ExportNamedDeclaration(ref mut export_named_declaration) => {
let Some(ref mut decl) = export_named_declaration.declaration else {
Expand Down Expand Up @@ -443,16 +437,16 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {
_ => unreachable!(),
};

program_body.push(Statement::ExportNamedDeclaration(ctx.ast.alloc(
ctx.ast.export_named_declaration(
program_body.push(Statement::ExportNamedDeclaration(
ctx.ast.alloc_export_named_declaration(
SPAN,
None,
export_specifiers,
None,
export_named_declaration.export_kind,
NONE,
),
)));
));
}
Statement::ClassDeclaration(class_decl) => {
inner_block.push(Self::transform_class_decl(class_decl.unbox(), ctx));
Expand Down Expand Up @@ -493,9 +487,7 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {
ctx.scoping_mut().change_scope_parent_id(*id, Some(block_scope_id));
}

program_body.push(Statement::BlockStatement(
ctx.ast.alloc(ctx.ast.block_statement_with_scope_id(SPAN, inner_block, block_scope_id)),
));
program_body.push(ctx.ast.statement_block_with_scope_id(SPAN, inner_block, block_scope_id));

std::mem::swap(&mut node.body, &mut program_body);
}
Expand Down Expand Up @@ -787,13 +779,12 @@ impl<'a> ExplicitResourceManagement<'a, '_> {
ctx.ast.expression_assignment(
SPAN,
AssignmentOperator::Assign,
SimpleAssignmentTarget::from(ctx.ast.member_expression_static(
AssignmentTarget::from(ctx.ast.member_expression_static(
SPAN,
using_ctx.create_read_expression(ctx),
ctx.ast.identifier_name(SPAN, "e"),
false,
))
.into(),
)),
ident.create_read_expression(ctx),
),
);
Expand Down Expand Up @@ -850,7 +841,7 @@ impl<'a> ExplicitResourceManagement<'a, '_> {

*ctx.scoping_mut().symbol_flags_mut(id.symbol_id()) = SymbolFlags::FunctionScopedVariable;

Statement::VariableDeclaration(ctx.ast.alloc(ctx.ast.variable_declaration(
Statement::VariableDeclaration(ctx.ast.alloc_variable_declaration(
SPAN,
VariableDeclarationKind::Var,
ctx.ast.vec1(ctx.ast.variable_declarator(
Expand All @@ -865,6 +856,6 @@ impl<'a> ExplicitResourceManagement<'a, '_> {
false,
)),
false,
)))
))
}
}
Loading