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.

workspace: Fix crash when closing active item mid-update (#61336)

Jakub Konka339f4237c4c8
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index e8e70de7966..32072f17728 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -1628,20 +1628,22 @@ impl Pane {
// Activate any non-pinned tab in different pane
let current_pane = cx.entity();
- self.workspace
- .update(cx, |workspace, cx| {
- let panes = workspace.center.panes();
- let pane_with_unpinned_tab = panes.iter().find(|pane| {
- if **pane == &current_pane {
- return false;
+ cx.defer_in(window, move |this, window, cx| {
+ this.workspace
+ .update(cx, |workspace, cx| {
+ let panes = workspace.center.panes();
+ let pane_with_unpinned_tab = panes.iter().find(|pane| {
+ if **pane == &current_pane {
+ return false;
+ }
+ pane.read(cx).has_unpinned_tabs()
+ });
+ if let Some(pane) = pane_with_unpinned_tab {
+ pane.update(cx, |pane, cx| pane.activate_unpinned_tab(window, cx));
}
- pane.read(cx).has_unpinned_tabs()
- });
- if let Some(pane) = pane_with_unpinned_tab {
- pane.update(cx, |pane, cx| pane.activate_unpinned_tab(window, cx));
- }
- })
- .ok();
+ })
+ .ok();
+ });
return Task::ready(Ok(()));
};
@@ -8568,6 +8570,52 @@ mod tests {
assert_item_labels(&pane2, ["B*"], cx);
}
+ #[gpui::test]
+ async fn test_close_pinned_tab_while_workspace_is_leased(cx: &mut TestAppContext) {
+ init_test(cx);
+ let fs = FakeFs::new(cx.executor());
+ let project = Project::test(fs, None, cx).await;
+ let (workspace, cx) =
+ cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+
+ // No non-pinned tabs in same pane, non-pinned tabs in another pane
+ let pane1 = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
+ let pane2 = workspace.update_in(cx, |workspace, window, cx| {
+ workspace.split_pane(pane1.clone(), SplitDirection::Right, window, cx)
+ });
+ add_labeled_item(&pane1, "A", false, cx);
+ pane1.update_in(cx, |pane, window, cx| {
+ pane.pin_tab_at(0, window, cx);
+ });
+ set_labeled_items(&pane1, ["A*"], cx);
+ add_labeled_item(&pane2, "B", false, cx);
+ set_labeled_items(&pane2, ["B"], cx);
+
+ // Close the active item while the workspace entity is already being
+ // updated. This used to double-lease the workspace and panic, because
+ // `close_active_item` synchronously reached back into the workspace to
+ // find an unpinned tab in another pane.
+ workspace.update_in(cx, |_workspace, window, cx| {
+ pane1.update(cx, |pane, cx| {
+ pane.close_active_item(
+ &CloseActiveItem {
+ save_intent: None,
+ close_pinned: false,
+ },
+ window,
+ cx,
+ )
+ .detach();
+ });
+ });
+ cx.run_until_parked();
+
+ // The pinned tab must not be closed, and the non-pinned tab of the
+ // other pane should have been activated.
+ assert_item_labels(&pane1, ["A*!"], cx);
+ assert_item_labels(&pane2, ["B*"], cx);
+ }
+
#[gpui::test]
async fn ensure_item_closing_actions_do_not_panic_when_no_items_exist(cx: &mut TestAppContext) {
init_test(cx);
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index cdfbcb78a34..ab9c1d06508 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -16552,6 +16552,57 @@ mod tests {
});
}
+ #[gpui::test]
+ async fn test_pane_close_active_item_from_dock_with_all_tabs_pinned(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let fs = FakeFs::new(cx.executor());
+ let project = Project::test(fs, [], cx).await;
+ let (multi_workspace, cx) =
+ cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
+ let workspace = multi_workspace.read_with(cx, |mw, _| mw.workspace().clone());
+ let panel = workspace.update_in(cx, |workspace, window, cx| {
+ let panel = cx.new(|cx| TestPanel::new(DockPosition::Right, 100, cx));
+ workspace.add_panel(panel.clone(), window, cx);
+
+ workspace
+ .right_dock()
+ .update(cx, |right_dock, cx| right_dock.set_open(true, window, cx));
+
+ panel
+ });
+
+ let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
+ let item_a = cx.new(TestItem::new);
+ let item_b = cx.new(TestItem::new);
+ let item_b_id = item_b.entity_id();
+
+ pane.update_in(cx, |pane, window, cx| {
+ pane.add_item(Box::new(item_a.clone()), true, true, None, window, cx);
+ pane.add_item(Box::new(item_b.clone()), true, true, None, window, cx);
+ pane.set_pinned_count(2);
+ });
+
+ workspace.update_in(cx, |workspace, window, cx| {
+ workspace.toggle_panel_focus::<TestPanel>(window, cx);
+ });
+
+ workspace.update_in(cx, |_, window, cx| {
+ assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
+ });
+
+ // Every center tab is pinned, so with `close_pinned` unset this must be
+ // a no-op. Dispatching it from the focused dock used to panic by
+ // re-entering the workspace while it was still mid-update.
+ cx.dispatch_action(pane::CloseActiveItem::default());
+ cx.run_until_parked();
+
+ pane.read_with(cx, |pane, _| {
+ assert_eq!(pane.items_len(), 2);
+ assert_eq!(pane.active_item().unwrap().item_id(), item_b_id);
+ });
+ }
+
#[gpui::test]
async fn test_panel_zoom_preserved_across_workspace_switch(cx: &mut TestAppContext) {
init_test(cx);