Merge branch 'main' into allow-following-outside-of-projects

2023-09-28 11:45:40 -07:00 · 2023-09-28 11:45:40 -07:00 · a8b35eb8f5
commit a8b35eb8f5
parent 0c95e5a6ca 3cf7164a54
147 changed files with 5383 additions and 1726 deletions
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@ -478,11 +478,7 @@ impl<T: Item> ItemHandle for ViewHandle<T> {
                        match item_event {
                            ItemEvent::CloseItem => {
                                pane.update(cx, |pane, cx| {
-                                    pane.close_item_by_id(
-                                        item.id(),
-                                        crate::SaveBehavior::PromptOnWrite,
-                                        cx,
-                                    )
+                                    pane.close_item_by_id(item.id(), crate::SaveIntent::Close, cx)
                                })
                                .detach_and_log_err(cx);
                                return;