Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

project panel: Get rid of unwrap in autofolding code (#17641)

Browse source 
@WeetHet spotted a crash in recently-introduced project panel
autofolding that relates to unwrapping.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-09-10 14:50:23 +02:00 • committed by GitHub
parent 75256bdfe1
commit 929eff815c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/project_panel/src/project_panel.rs
View file

@ -115,7 +115,6 @@ struct EntryDetails {
is_cut: bool, is_cut: bool,
git_status: Option<GitFileStatus>, git_status: Option<GitFileStatus>,
is_private: bool, is_private: bool,
is_auto_folded: bool,
worktree_id: WorktreeId, worktree_id: WorktreeId,
canonical_path: Option<Box<Path>>, canonical_path: Option<Box<Path>>,
} }
@ -2099,7 +2098,6 @@ impl ProjectPanel {
.map_or(false, |e| e.is_cut() && e.items().contains(&selection)), .map_or(false, |e| e.is_cut() && e.items().contains(&selection)),
git_status: status, git_status: status,
is_private: entry.is_private, is_private: entry.is_private,
is_auto_folded: difference > 1,
worktree_id: *worktree_id, worktree_id: *worktree_id,
canonical_path: entry.canonical_path.clone(), canonical_path: entry.canonical_path.clone(),
}; };
@ -2212,7 +2210,6 @@ impl ProjectPanel {
active_selection: selection, active_selection: selection,
marked_selections: selections, marked_selections: selections,
}; };
let is_auto_folded = details.is_auto_folded;
div() div()
.id(entry_id.to_proto() as usize) .id(entry_id.to_proto() as usize)
.on_drag_move::<ExternalPaths>(cx.listener( .on_drag_move::<ExternalPaths>(cx.listener(
@ -2314,8 +2311,9 @@ impl ProjectPanel {
h_flex().h_6().w_full().child(editor.clone()) h_flex().h_6().w_full().child(editor.clone())
} else { } else {
h_flex().h_6().map(|this| { h_flex().h_6().map(|this| {
if is_auto_folded && is_active { if let Some(folded_ancestors) =
let folded_ancestors = self.ancestors.get(&entry_id).unwrap(); is_active.then(|| self.ancestors.get(&entry_id)).flatten()
{
let Some(part_to_highlight) = Path::new(&file_name) let Some(part_to_highlight) = Path::new(&file_name)
.ancestors() .ancestors()
.nth(folded_ancestors.current_ancestor_depth) .nth(folded_ancestors.current_ancestor_depth)