dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 04:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(semantic)!: ScopeTree::get_child_ids + get_child_ids_mut return value not Option (#5058)

Browse source 
Previously `ScopeTree::get_child_ids` and `ScopeTree::get_child_ids_mut` returned an `Option`. Instead return the unwrapped value, in line with other methods e.g. `get_flags`.
This commit is contained in:
overlookmotel 2024-08-22 05:57:55 +00:00
parent afe728a73a
commit f2b8d82499
6 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/oxc_semantic/src/post_transform_checker.rs
View file

@ -401,9 +401,8 @@ impl<'s> PostTransformChecker<'s> {
}
// Check children match
let child_ids = self.get_pair(scope_ids, |data, scope_id| {
data.scopes.get_child_ids(scope_id).cloned().unwrap_or_default()
});
let child_ids = self
.get_pair(scope_ids, |data, scope_id| data.scopes.get_child_ids(scope_id).to_vec());
let is_match = child_ids.after_transform.len() == child_ids.rebuilt.len() && {
let mut child_ids_after_transform = child_ids
.after_transform

20
crates/oxc_semantic/src/scope.rs
View file

@ -95,24 +95,16 @@ impl ScopeTree {
list.into_iter()
}
/// Get the child scopes of a scope.
///
/// Will return [`None`] if no scope exists, which should never happen if
/// you obtained `scope_id` through valid means. Scopes with no children
/// return [`Some`] empty [`Vec`].
/// Get the child scopes of a scope
#[inline]
pub fn get_child_ids(&self, scope_id: ScopeId) -> Option<&Vec<ScopeId>> {
self.child_ids.get(scope_id)
pub fn get_child_ids(&self, scope_id: ScopeId) -> &[ScopeId] {
&self.child_ids[scope_id]
}
/// Get a mutable reference to a scope's children.
///
/// Will return [`None`] if no scope exists, which should never happen if
/// you obtained `scope_id` through valid means. Scopes with no children
/// return [`Some`] empty [`Vec`].
/// Get a mutable reference to a scope's children
#[inline]
pub fn get_child_ids_mut(&mut self, scope_id: ScopeId) -> Option<&mut Vec<ScopeId>> {
self.child_ids.get_mut(scope_id)
pub fn get_child_ids_mut(&mut self, scope_id: ScopeId) -> &mut Vec<ScopeId> {
&mut self.child_ids[scope_id]
}
pub fn descendants_from_root(&self) -> impl Iterator<Item = ScopeId> + '_ {

2
crates/oxc_semantic/tests/integration/scopes.rs
View file

@ -27,7 +27,7 @@ fn test_only_program() {
// children
assert_eq!(scopes.descendants(root).count(), 0);
assert!(scopes.get_child_ids(root).unwrap().is_empty());
assert!(scopes.get_child_ids(root).is_empty());
}
#[test]

9
crates/oxc_semantic/tests/main.rs
View file

@ -16,11 +16,10 @@ fn get_scope_snapshot(semantic: &Semantic, scopes: impl Iterator<Item = ScopeId>
}
let flags = semantic.scopes().get_flags(scope_id);
result.push('{');
if let Some(child_ids) = semantic.scopes().get_child_ids(scope_id) {
result.push_str("\"children\":");
result.push_str(&get_scope_snapshot(semantic, child_ids.iter().copied()));
result.push(',');
}
let child_ids = semantic.scopes().get_child_ids(scope_id);
result.push_str("\"children\":");
result.push_str(&get_scope_snapshot(semantic, child_ids.iter().copied()));
result.push(',');
result.push_str(format!("\"flags\": \"{flags:?}\",").as_str());
result.push_str(format!("\"id\": {},", scope_id.index()).as_str());
result.push_str(

6
crates/oxc_traverse/src/context/scoping.rs
View file

@ -122,10 +122,8 @@ impl TraverseScoping {
fn insert_scope_below(&mut self, child_scope_ids: &[ScopeId], flags: ScopeFlags) -> ScopeId {
// Remove these scopes from parent's children
if let Some(current_child_scope_ids) = self.scopes.get_child_ids_mut(self.current_scope_id)
{
current_child_scope_ids.retain(|scope_id| !child_scope_ids.contains(scope_id));
}
let current_child_scope_ids = self.scopes.get_child_ids_mut(self.current_scope_id);
current_child_scope_ids.retain(|scope_id| !child_scope_ids.contains(scope_id));
// Create new scope as child of parent
let new_scope_id = self.create_child_scope_of_current(flags);

8
crates/oxc_wasm/src/lib.rs
View file

@ -309,7 +309,7 @@ impl Oxc {
semantic: &Semantic,
scope_text: &mut String,
depth: usize,
scope_ids: &Vec<ScopeId>,
scope_ids: &[ScopeId],
) {
let space = " ".repeat(depth * 2);
@ -332,15 +332,13 @@ impl Oxc {
scope_text.push_str(&format!("\n{binding_space}}}\n"));
}
if let Some(next_scope_ids) = next_scope_ids {
write_scope_text(semantic, scope_text, depth + 1, next_scope_ids);
}
write_scope_text(semantic, scope_text, depth + 1, next_scope_ids);
scope_text.push_str(&format!("{space}}}\n"));
}
}
let mut scope_text = String::default();
write_scope_text(semantic, &mut scope_text, 0, &vec![semantic.scopes().root_scope_id()]);
write_scope_text(semantic, &mut scope_text, 0, &[semantic.scopes().root_scope_id()]);
scope_text
}