Skip to content

feat(gui): deduplicate scopes in sidebar #19

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
rohanku merged 2 commits into from
Sep 23, 2025
Merged

feat(gui): deduplicate scopes in sidebar #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bc7d2d
feat(gui): deduplicate scopes in sidebar
rohanku Sep 23, 2025
2b5820d
fix lint errors
rohanku Sep 23, 2025
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
33 changes: 22 additions & 11 deletions core/gui/src/editor/toolbars.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ impl HierarchySideBar {
solved_cell: &CompileOutputState,
scopes: &mut Vec<Div>,
scope: ScopeAddress,
count: usize,
depth: usize,
) {
let solved_cell_clone_1 = self.solved_cell.clone();
Expand All @@ -152,9 +153,14 @@ impl HierarchySideBar {
.flex_1()
.overflow_hidden()
.child(format!(
"{}{}",
"{}{}{}",
std::iter::repeat_n(" ", depth).collect::<String>(),
&scope_state.name,
if count > 1 {
format!(" ({count})")
} else {
"".to_string()
}
))
.on_click(move |_event, _window, cx| {
solved_cell_clone_1.update(cx, |state, cx| {
Expand All @@ -181,20 +187,23 @@ impl HierarchySideBar {
),
);
let scope_info = &solved_cell.output.cells[&scope.cell].scopes[&scope.scope];
let mut cells = IndexMap::new();
for elt in scope_info.elts.clone() {
if let SolvedValue::Instance(inst) = &elt {
let scope = solved_cell.output.cells[&inst.cell].root;
self.render_scopes_helper(
solved_cell,
scopes,
ScopeAddress {
scope,
cell: inst.cell,
},
depth + 1,
);
*cells.entry(inst.cell).or_insert(0) += 1;
}
}

for (cell, count) in cells {
let scope = solved_cell.output.cells[&cell].root;
self.render_scopes_helper(
solved_cell,
scopes,
ScopeAddress { scope, cell },
count,
depth + 1,
);
}
for child_scope in scope_info.children.clone() {
self.render_scopes_helper(
solved_cell,
Expand All @@ -203,6 +212,7 @@ impl HierarchySideBar {
scope: child_scope,
cell: scope.cell,
},
1,
depth + 1,
);
}
Expand All @@ -219,6 +229,7 @@ impl HierarchySideBar {
scope,
cell: state.output.top,
},
1,
0,
);
}
Expand Down