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

Fix bug where pinned tabs were closed when closing others (#31783)

Browse source 
Closes https://github.com/zed-industries/zed/issues/28166

Release Notes:

- Fixed a bug where pinned tabs were closed when running `Close Others`
from the tab context menu
This commit is contained in:
Joseph T. Lyons 2025-05-30 16:48:33 -04:00 • committed by GitHub
parent 1704dbea7e
commit 019c8ded77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/workspace/src/pane.rs
View file

@ -1328,7 +1328,7 @@ impl Pane {
&mut self, &mut self,
item_id: EntityId, item_id: EntityId,
action: &CloseItemsToTheLeft, action: &CloseItemsToTheLeft,
non_closeable_items: Vec<EntityId>, non_closeable_items: HashSet<EntityId>,
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Task<Result<()>> { ) -> Task<Result<()>> {
@ -1368,7 +1368,7 @@ impl Pane {
&mut self, &mut self,
item_id: EntityId, item_id: EntityId,
action: &CloseItemsToTheRight, action: &CloseItemsToTheRight,
non_closeable_items: Vec<EntityId>, non_closeable_items: HashSet<EntityId>,
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Task<Result<()>> { ) -> Task<Result<()>> {
@ -2404,8 +2404,10 @@ impl Pane {
})) }))
.disabled(total_items == 1) .disabled(total_items == 1)
.handler(window.handler_for(&pane, move |pane, window, cx| { .handler(window.handler_for(&pane, move |pane, window, cx| {
let non_closeable_ids =
pane.get_non_closeable_item_ids(false);
pane.close_items(window, cx, SaveIntent::Close, |id| { pane.close_items(window, cx, SaveIntent::Close, |id| {
id != item_id id != item_id && !non_closeable_ids.contains(&id)
}) })
.detach_and_log_err(cx); .detach_and_log_err(cx);
})), })),
@ -3085,9 +3087,9 @@ impl Pane {
self.display_nav_history_buttons = display; self.display_nav_history_buttons = display;
} }
fn get_non_closeable_item_ids(&self, close_pinned: bool) -> Vec<EntityId> { fn get_non_closeable_item_ids(&self, close_pinned: bool) -> HashSet<EntityId> {
if close_pinned { if close_pinned {
return vec![]; return HashSet::from_iter([]);
} }
self.items self.items
@ -4380,7 +4382,26 @@ mod tests {
cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx)); cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone()); let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
set_labeled_items(&pane, ["A", "B", "C*", "D", "E"], cx); let item_a = add_labeled_item(&pane, "A", false, cx);
pane.update_in(cx, |pane, window, cx| {
let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
pane.pin_tab_at(ix, window, cx);
});
assert_item_labels(&pane, ["A*"], cx);
let item_b = add_labeled_item(&pane, "B", false, cx);
pane.update_in(cx, |pane, window, cx| {
let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
pane.pin_tab_at(ix, window, cx);
});
assert_item_labels(&pane, ["A", "B*"], cx);
add_labeled_item(&pane, "C", false, cx);
assert_item_labels(&pane, ["A", "B", "C*"], cx);
add_labeled_item(&pane, "D", false, cx);
add_labeled_item(&pane, "E", false, cx);
assert_item_labels(&pane, ["A", "B", "C", "D", "E*"], cx);
pane.update_in(cx, |pane, window, cx| { pane.update_in(cx, |pane, window, cx| {
pane.close_inactive_items( pane.close_inactive_items(
@ -4395,7 +4416,7 @@ mod tests {
.unwrap() .unwrap()
.await .await
.unwrap(); .unwrap();
assert_item_labels(&pane, ["C*"], cx); assert_item_labels(&pane, ["A", "B", "E*"], cx);
} }
#[gpui::test] #[gpui::test]