From 76fe33245fcff14013760255223d4b1cb92573c1 Mon Sep 17 00:00:00 2001 From: Smit Barmase Date: Sat, 5 Jul 2025 05:57:37 +0530 Subject: [PATCH] project_panel: Fix indent guide collapse on secondary click for multiple worktrees (#33939) Release Notes: - Fixed issue where `cmd`/`ctrl` click on indent guide would not collapse directory in case of multiple projects. --- crates/project_panel/src/project_panel.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 614f8ccf81..ded6e0e3f4 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -3303,12 +3303,13 @@ impl ProjectPanel { fn entry_at_index(&self, index: usize) -> Option<(WorktreeId, GitEntryRef<'_>)> { let mut offset = 0; for (worktree_id, visible_worktree_entries, _) in &self.visible_entries { - if visible_worktree_entries.len() > offset + index { + let current_len = visible_worktree_entries.len(); + if index < offset + current_len { return visible_worktree_entries - .get(index) + .get(index - offset) .map(|entry| (*worktree_id, entry.to_ref())); } - offset += visible_worktree_entries.len(); + offset += current_len; } None }