Skip to content

refactor(transformer/class-properties): remove all *_if_super methods in static_block_and_prop_init #8104

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
Dec 31, 2024
Merged

refactor(transformer/class-properties): remove all *_if_super methods in static_block_and_prop_init #8104

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
77 changes: 13 additions & 64 deletions crates/oxc_transformer/src/es2022/class_properties/static_block_and_prop_init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,24 +238,27 @@ impl<'a, 'ctx, 'v> VisitMut<'a> for StaticVisitor<'a, 'ctx, 'v> {
}
}
// `super.prop`
Expression::StaticMemberExpression(_) => {
self.transform_static_member_expression_if_super(expr);
Expression::StaticMemberExpression(_) if self.this_depth == 0 => {
self.super_converter.transform_static_member_expression(expr, self.ctx);
}
// `super[prop]`
Expression::ComputedMemberExpression(_) => {
self.transform_computed_member_expression_if_super(expr);
Expression::ComputedMemberExpression(_) if self.this_depth == 0 => {
self.super_converter.transform_computed_member_expression(expr, self.ctx);
}
// `super.prop()`
Expression::CallExpression(call_expr) => {
self.transform_call_expression_if_super_member_expression(call_expr);
Expression::CallExpression(call_expr) if self.this_depth == 0 => {
self.super_converter
.transform_call_expression_for_super_member_expr(call_expr, self.ctx);
}
// `super.prop = value`, `super.prop += value`, `super.prop ??= value`
Expression::AssignmentExpression(_) => {
self.transform_assignment_expression_if_super_member_assignment_target(expr);
Expression::AssignmentExpression(_) if self.this_depth == 0 => {
self.super_converter
.transform_assignment_expression_for_super_assignment_target(expr, self.ctx);
}
// `super.prop++`, `--super.prop`
Expression::UpdateExpression(_) => {
self.transform_update_expression_if_super_member_assignment_target(expr);
Expression::UpdateExpression(_) if self.this_depth == 0 => {
self.super_converter
.transform_update_expression_for_super_assignment_target(expr, self.ctx);
}
_ => {}
}
Expand Down Expand Up @@ -535,58 +538,4 @@ impl<'a, 'ctx, 'v> StaticVisitor<'a, 'ctx, 'v> {
self.ctx.scopes_mut().change_parent_id(scope_id, Some(current_scope_id));
}
}

// `#[inline]` into visitor to keep common path where member expression isn't `super.prop` fast
#[inline]
fn transform_static_member_expression_if_super(&mut self, expr: &mut Expression<'a>) {
if self.this_depth == 0 {
self.super_converter.transform_static_member_expression(expr, self.ctx);
}
}

// `#[inline]` into visitor to keep common path where member expression isn't `super.prop` fast
#[inline]
fn transform_computed_member_expression_if_super(&mut self, expr: &mut Expression<'a>) {
if self.this_depth == 0 {
self.super_converter.transform_computed_member_expression(expr, self.ctx);
}
}

// `#[inline]` into visitor to keep common path where call expression isn't `super.prop()` fast
#[inline]
fn transform_call_expression_if_super_member_expression(
&mut self,
call_expr: &mut CallExpression<'a>,
) {
if self.this_depth == 0 {
self.super_converter
.transform_call_expression_for_super_member_expr(call_expr, self.ctx);
}
}

// `#[inline]` into visitor to keep common path where assignment expression isn't
// `super.prop += 1` fast
#[inline]
fn transform_assignment_expression_if_super_member_assignment_target(
&mut self,
expr: &mut Expression<'a>,
) {
if self.this_depth == 0 {
self.super_converter
.transform_assignment_expression_for_super_assignment_target(expr, self.ctx);
}
}

// `#[inline]` into visitor to keep common path where assignment expression isn't
// `super.prop++` fast
#[inline]
fn transform_update_expression_if_super_member_assignment_target(
&mut self,
expr: &mut Expression<'a>,
) {
if self.this_depth == 0 {
self.super_converter
.transform_update_expression_for_super_assignment_target(expr, self.ctx);
}
}
}