Skip to content

Commit 77d397a

Browse files
committed
refactor(mangler): move NodeId lookup into is_name_set_reference_node (#12664)
Pure refactor. Follow-on after #12663. Move looking up `NodeId` for a `Reference` into `is_name_set_reference_node`. This makes it clearer that the `ReferenceId` and `NodeId` are connected.
1 parent 4adc1ed commit 77d397a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

crates/oxc_mangler/src/keep_names.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
use oxc_ast::{AstKind, ast::*};
2-
use oxc_semantic::{AstNode, AstNodes, NodeId, ReferenceId, Scoping, SymbolId};
31
use rustc_hash::FxHashSet;
42

3+
use oxc_ast::{AstKind, ast::*};
4+
use oxc_semantic::{AstNode, AstNodes, ReferenceId, Scoping, SymbolId};
5+
56
#[derive(Debug, Clone, Copy, Default)]
67
pub struct MangleOptionsKeepNames {
78
/// Preserve `name` property for functions.
@@ -73,10 +74,10 @@ impl<'a, 'b: 'a> NameSymbolCollector<'a, 'b> {
7374
}
7475

7576
fn has_name_set_reference_node(&self, symbol_id: SymbolId) -> bool {
76-
self.scoping.get_resolved_reference_ids(symbol_id).into_iter().any(|reference_id| {
77-
let node_id = self.scoping.get_reference(*reference_id).node_id();
78-
self.is_name_set_reference_node(node_id, *reference_id)
79-
})
77+
self.scoping
78+
.get_resolved_reference_ids(symbol_id)
79+
.iter()
80+
.any(|&reference_id| self.is_name_set_reference_node(reference_id))
8081
}
8182

8283
fn is_name_set_declare_node(&self, node: &'a AstNode, symbol_id: SymbolId) -> bool {
@@ -110,7 +111,8 @@ impl<'a, 'b: 'a> NameSymbolCollector<'a, 'b> {
110111
}
111112
}
112113

113-
fn is_name_set_reference_node(&self, node_id: NodeId, reference_id: ReferenceId) -> bool {
114+
fn is_name_set_reference_node(&self, reference_id: ReferenceId) -> bool {
115+
let node_id = self.scoping.get_reference(reference_id).node_id();
114116
let parent_node_id = self.ast_nodes.parent_id(node_id);
115117
match self.ast_nodes.kind(parent_node_id) {
116118
// Check for direct assignment: foo = function() {}

0 commit comments

Comments
 (0)