From 426df71c1380caa360badbe6d92b64a4cbfe94c3 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Wed, 6 Nov 2024 14:08:06 +0000 Subject: [PATCH] refactor(transformer/arrow-functions): use `scope_id` method (#7164) Follow-on after #7125. Use `scope_id` method introduced in #7127. --- .../src/common/arrow_function_converter.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/oxc_transformer/src/common/arrow_function_converter.rs b/crates/oxc_transformer/src/common/arrow_function_converter.rs index d964f855c..eeb84f1df 100644 --- a/crates/oxc_transformer/src/common/arrow_function_converter.rs +++ b/crates/oxc_transformer/src/common/arrow_function_converter.rs @@ -144,9 +144,10 @@ impl<'a> Traverse<'a> for ArrowFunctionConverter<'a> { } if let Some(this_var) = self.this_var_stack.take_last() { + let target_scope_id = program.scope_id(); self.insert_this_var_statement_at_the_top_of_statements( &mut program.body, - program.scope_id.get().unwrap(), + target_scope_id, &this_var, ctx, ); @@ -180,11 +181,12 @@ impl<'a> Traverse<'a> for ArrowFunctionConverter<'a> { } if let Some(this_var) = self.this_var_stack.pop() { + let target_scope_id = func.scope_id(); let Some(body) = &mut func.body else { unreachable!() }; self.insert_this_var_statement_at_the_top_of_statements( &mut body.statements, - func.scope_id.get().unwrap(), + target_scope_id, &this_var, ctx, ); @@ -205,9 +207,10 @@ impl<'a> Traverse<'a> for ArrowFunctionConverter<'a> { } if let Some(this_var) = self.this_var_stack.pop() { + let target_scope_id = block.scope_id(); self.insert_this_var_statement_at_the_top_of_statements( &mut block.body, - block.scope_id.get().unwrap(), + target_scope_id, &this_var, ctx, );