Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git_ui: Resolve worktree picker remove-from-window clicks by path (#59084)

MartinYe1234af7bdd5fef6a
diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rs
index 312697bf1b9..28b5ccd68f5 100644
--- a/crates/git_ui/src/worktree_picker.rs
+++ b/crates/git_ui/src/worktree_picker.rs
@@ -702,15 +702,14 @@ impl WorktreePickerDelegate {
fn remove_worktree_from_window(
&mut self,
- ix: usize,
+ worktree_path: &Path,
window: &mut Window,
cx: &mut Context<Picker<Self>>,
) {
- let Some(WorktreeEntry::Worktree { worktree, .. }) = self.matches.get(ix) else {
+ if self.deleting_worktree_paths.contains(worktree_path) {
return;
- };
- let Some(workspace_to_remove) =
- self.workspace_for_open_worktree(&worktree.path, window, cx)
+ }
+ let Some(workspace_to_remove) = self.workspace_for_open_worktree(worktree_path, window, cx)
else {
return;
};
@@ -1314,22 +1313,29 @@ impl PickerDelegate for WorktreePickerDelegate {
})),
);
- let remove_from_window_button = IconButton::new(
- ("remove-worktree-from-window", ix),
- IconName::Close,
- )
- .icon_size(IconSize::Small)
- .tooltip(Tooltip::text("Remove Worktree from Window"))
- .on_click(cx.listener(move |picker, _, window, cx| {
- picker.delegate.remove_worktree_from_window(ix, window, cx);
- }));
-
this.end_slot(
h_flex()
.gap_0p5()
.child(open_in_new_window_button)
.when(can_remove_from_window, |this| {
- this.child(remove_from_window_button)
+ let worktree_path = worktree.path.clone();
+ this.child(
+ IconButton::new(
+ ("remove-worktree-from-window", ix),
+ IconName::Close,
+ )
+ .icon_size(IconSize::Small)
+ .tooltip(Tooltip::text("Remove Worktree from Window"))
+ .on_click(
+ cx.listener(move |picker, _, window, cx| {
+ picker.delegate.remove_worktree_from_window(
+ &worktree_path,
+ window,
+ cx,
+ );
+ }),
+ ),
+ )
})
.when(can_delete, |this| this.child(delete_button)),
)
@@ -2211,7 +2217,6 @@ mod tests {
});
cx.run_until_parked();
- let index = worktree_index(&worktree_picker, &worktree_path, &mut cx);
worktree_picker.update(&mut cx, |worktree_picker, cx| {
worktree_picker.picker.update(cx, |picker, _| {
assert!(
@@ -2228,7 +2233,7 @@ mod tests {
worktree_picker.picker.update(cx, |picker, cx| {
picker
.delegate
- .remove_worktree_from_window(index, window, cx);
+ .remove_worktree_from_window(&worktree_path, window, cx);
})
});
cx.run_until_parked();