Skip to content

refactor(transformer/using): remove use of child scope ids in enter_program #9748

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

refactor(transformer/using): remove use of child scope ids in enter_program #9748

Show file tree
Hide file tree
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
37 changes: 6 additions & 31 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 @@ -217,8 +217,6 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {

let program_body = ctx.ast.move_vec(&mut program.body);

let mut scopes_to_skip_move: Vec<ScopeId> = Vec::new();

let (mut program_body, inner_block): (
ArenaVec<'a, Statement<'a>>,
ArenaVec<'a, Statement<'a>>,
Expand All @@ -227,11 +225,9 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {
|(mut program_body, mut inner_block), mut stmt| {
let address = stmt.address();
match stmt {
Statement::FunctionDeclaration(ref fun) => {
scopes_to_skip_move.push(fun.scope_id());
program_body.push(stmt);
}
Statement::ImportDeclaration(_) | Statement::ExportAllDeclaration(_) => {
Statement::FunctionDeclaration(_)
| Statement::ImportDeclaration(_)
| Statement::ExportAllDeclaration(_) => {
program_body.push(stmt);
}
Statement::ExportDefaultDeclaration(ref mut export_default_decl) => {
Expand All @@ -246,8 +242,7 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {

(BoundIdentifier::from_binding_ident(&id), id.span)
}
ExportDefaultDeclarationKind::FunctionDeclaration(fun) => {
scopes_to_skip_move.push(fun.scope_id());
ExportDefaultDeclarationKind::FunctionDeclaration(_) => {
program_body.push(stmt);
return (program_body, inner_block);
}
Expand Down Expand Up @@ -325,17 +320,6 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {
| Declaration::TSModuleDeclaration(_)
| Declaration::TSImportEqualsDeclaration(_)
) {
if let Some(stmt_scope) = match decl {
Declaration::FunctionDeclaration(fun) => Some(fun.scope_id()),
Declaration::TSTypeAliasDeclaration(decl) => Some(decl.scope_id()),
Declaration::TSInterfaceDeclaration(decl) => Some(decl.scope_id()),
Declaration::TSEnumDeclaration(decl) => Some(decl.scope_id()),
Declaration::TSModuleDeclaration(decl) => Some(decl.scope_id()),
Declaration::TSImportEqualsDeclaration(_) => None,
_ => unreachable!(),
} {
scopes_to_skip_move.push(stmt_scope);
}
program_body.push(stmt);

return (program_body, inner_block);
Expand Down Expand Up @@ -434,17 +418,8 @@ impl<'a> Traverse<'a> for ExplicitResourceManagement<'a, '_> {
},
);

let current_scope_id = ctx.current_scope_id();
let block_scope_id = ctx.create_child_scope(current_scope_id, ScopeFlags::empty());

let child_ids = ctx.scoping_mut().get_scope_child_ids(current_scope_id).to_vec();
for id in child_ids
.iter()
.filter(|id| !scopes_to_skip_move.contains(id) && *id != &block_scope_id)
{
ctx.scoping_mut().change_scope_parent_id(*id, Some(block_scope_id));
}

let block_scope_id =
ctx.scoping.insert_scope_below_statements(&inner_block, ScopeFlags::empty());
program_body.push(ctx.ast.statement_block_with_scope_id(SPAN, inner_block, block_scope_id));

std::mem::swap(&mut program.body, &mut program_body);
Expand Down
11 changes: 11 additions & 0 deletions crates/oxc_traverse/src/context/scoping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use compact_str::CompactString;
use itoa::Buffer as ItoaBuffer;
use rustc_hash::FxHashSet;

use oxc_allocator::Vec as ArenaVec;
use oxc_ast::ast::*;
use oxc_ast_visit::Visit;
use oxc_semantic::{NodeId, Reference, Scoping};
Expand Down Expand Up @@ -118,6 +119,16 @@ impl TraverseScoping {
self.insert_scope_below(&collector.scope_ids, flags)
}

pub fn insert_scope_below_statements(
&mut self,
expr: &ArenaVec<Statement>,
flags: ScopeFlags,
) -> ScopeId {
let mut collector = ChildScopeCollector::new();
collector.visit_statements(expr);
self.insert_scope_below(&collector.scope_ids, flags)
}

fn insert_scope_below(&mut self, child_scope_ids: &[ScopeId], flags: ScopeFlags) -> ScopeId {
// Remove these scopes from parent's children
if self.scoping.has_scope_child_ids() {
Expand Down
Loading