Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix removal of unloaded project groups (#66127)
zhujiatao876c1b0c5fb0
diff --git a/crates/workspace/src/multi_workspace.rs b/crates/workspace/src/multi_workspace.rsindex 93c0e9abe9e..0f47414f4be 100644--- a/crates/workspace/src/multi_workspace.rs+++ b/crates/workspace/src/multi_workspace.rs@@ -962,10 +962,19 @@ impl MultiWorkspace {}let workspaces = self.workspaces_for_project_group(group_key, cx);+ if workspaces.is_empty() {+ let previous_group_count = self.project_groups.len();+ self.project_groups.retain(|group| group.key != *group_key);+ if self.project_groups.len() != previous_group_count {+ cx.emit(MultiWorkspaceEvent::ProjectGroupsChanged);+ self.serialize(cx);+ cx.notify();+ return Task::ready(Ok(true));+ }+ return Task::ready(Ok(false));+ }- let task = self.remove(workspaces, RemovalIntent::CloseProject, window, cx);-- task+ self.remove(workspaces, RemovalIntent::CloseProject, window, cx)}/// Returns the nearest retained workspace outside the project group atdiff --git a/crates/workspace/src/multi_workspace_tests.rs b/crates/workspace/src/multi_workspace_tests.rsindex 91abd7d5480..8d77cdd492b 100644--- a/crates/workspace/src/multi_workspace_tests.rs+++ b/crates/workspace/src/multi_workspace_tests.rs@@ -1026,6 +1026,38 @@ async fn test_close_workspace_opens_unloaded_local_neighbor(cx: &mut TestAppCont});}+#[gpui::test]+async fn test_remove_unloaded_project_group_removes_its_row(cx: &mut TestAppContext) {+ init_test(cx);+ let fs = FakeFs::new(cx.executor());+ fs.insert_tree("/project-a", json!({})).await;++ let project_a = Project::test(fs, ["/project-a".as_ref()], cx).await;+ let key_a = project_a.read_with(cx, |project, cx| project.project_group_key(cx));+ let key_b = ProjectGroupKey::new(None, PathList::new(&[PathBuf::from("/project-b")]));+ let (multi_workspace, cx) = setup_multi_workspace(&[project_a], cx);++ multi_workspace.update(cx, |multi_workspace, _cx| {+ multi_workspace.test_add_project_group(ProjectGroup {+ key: key_b.clone(),+ workspaces: Vec::new(),+ expanded: true,+ });+ });++ let removed = multi_workspace+ .update_in(cx, |multi_workspace, window, cx| {+ multi_workspace.remove_project_group(&key_b, window, cx)+ })+ .await+ .expect("removing an unloaded project group should succeed");++ assert!(removed, "the unloaded project group row should be removed");+ multi_workspace.read_with(cx, |multi_workspace, _cx| {+ assert_eq!(multi_workspace.project_group_keys(), vec![key_a]);+ });+}+#[gpui::test]async fn test_remove_project_group_opens_unloaded_local_neighbor(cx: &mut TestAppContext) {init_test(cx);