Skip to content

refactor(transform/hir): de-duplicate HIR-walking helpers (#5293) #5305

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
proggeramlug merged 2 commits into from
Jun 17, 2026
Merged

refactor(transform/hir): de-duplicate HIR-walking helpers (#5293) #5305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a76aa0
refactor(transform/hir): de-duplicate HIR-walking helpers (#5293)
Jun 17, 2026
1c7ba04
style(hir): rustfmt collect_assigned_locals_expr walk closure
claude Jun 17, 2026
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
1,082 changes: 21 additions & 1,061 deletions crates/perry-hir/src/analysis.rs
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 0 additions & 32 deletions crates/perry-hir/src/lower/lower_expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,6 @@ use crate::lower_types::extract_ts_type_with_ctx;
/// crash, and they now get a clean "nested too deeply" diagnostic instead.
pub(crate) const MAX_EXPR_LOWER_DEPTH: u32 = 2000;

fn class_computed_member_registration_expr(class_name: &str, member: &ClassComputedMember) -> Expr {
match member.kind {
ClassComputedMemberKind::Method => Expr::RegisterClassComputedMethod {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
method_name: member.function.name.clone(),
is_static: member.is_static,
param_count: member.function.params.len() as u32,
has_rest: member
.function
.params
.last()
.map(|p| p.is_rest)
.unwrap_or(false),
},
ClassComputedMemberKind::Getter => Expr::RegisterClassComputedAccessor {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
getter_name: Some(member.function.name.clone()),
setter_name: None,
is_static: member.is_static,
},
ClassComputedMemberKind::Setter => Expr::RegisterClassComputedAccessor {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
getter_name: None,
setter_name: Some(member.function.name.clone()),
is_static: member.is_static,
},
}
}

pub(crate) fn throw_reference_error_expr(helper_name: &str) -> Expr {
Expr::Call {
callee: Box::new(Expr::ExternFuncRef {
Expand Down
32 changes: 0 additions & 32 deletions crates/perry-hir/src/lower/module_decl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,6 @@ use swc_ecma_ast as ast;
use super::*;
use crate::ir::*;

fn class_computed_member_registration_expr(class_name: &str, member: &ClassComputedMember) -> Expr {
match member.kind {
ClassComputedMemberKind::Method => Expr::RegisterClassComputedMethod {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
method_name: member.function.name.clone(),
is_static: member.is_static,
param_count: member.function.params.len() as u32,
has_rest: member
.function
.params
.last()
.map(|p| p.is_rest)
.unwrap_or(false),
},
ClassComputedMemberKind::Getter => Expr::RegisterClassComputedAccessor {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
getter_name: Some(member.function.name.clone()),
setter_name: None,
is_static: member.is_static,
},
ClassComputedMemberKind::Setter => Expr::RegisterClassComputedAccessor {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
getter_name: None,
setter_name: Some(member.function.name.clone()),
is_static: member.is_static,
},
}
}

fn is_cjs_style_native_default_import(module_name: &str) -> bool {
matches!(
module_name,
Expand Down
32 changes: 0 additions & 32 deletions crates/perry-hir/src/lower/stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,6 @@ use swc_ecma_ast as ast;
use super::*;
use crate::ir::*;

fn class_computed_member_registration_expr(class_name: &str, member: &ClassComputedMember) -> Expr {
match member.kind {
ClassComputedMemberKind::Method => Expr::RegisterClassComputedMethod {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
method_name: member.function.name.clone(),
is_static: member.is_static,
param_count: member.function.params.len() as u32,
has_rest: member
.function
.params
.last()
.map(|p| p.is_rest)
.unwrap_or(false),
},
ClassComputedMemberKind::Getter => Expr::RegisterClassComputedAccessor {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
getter_name: Some(member.function.name.clone()),
setter_name: None,
is_static: member.is_static,
},
ClassComputedMemberKind::Setter => Expr::RegisterClassComputedAccessor {
class_name: class_name.to_string(),
key_expr: Box::new(member.key_expr.clone()),
getter_name: None,
setter_name: Some(member.function.name.clone()),
is_static: member.is_static,
},
}
}

fn emit_class_expression_value_binding(
ctx: &mut LoweringContext,
module: &mut Module,
Expand Down
1 change: 1 addition & 0 deletions crates/perry-hir/src/lower_decl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub(crate) use block::{
};
pub(crate) use body_stmt::{find_native_return_in_stmts, lower_body_stmt};
pub(crate) use class_captures::synthesize_class_captures;
pub(crate) use class_computed::class_computed_member_registration_expr;
pub(crate) use class_decl::{lower_class_decl, lower_class_from_ast};
pub(crate) use class_members::{
lower_class_method, lower_class_method_with_name, lower_class_prop, lower_constructor,
Expand Down
Loading
Loading