diff --git a/crates/feedback/src/feedback_editor.rs b/crates/feedback/src/feedback_editor.rs index 656b3282e00145e2d49c6356a939bb6f26640e30..e30b85170c5fd7f128948d7622c166b03b30522d 100644 --- a/crates/feedback/src/feedback_editor.rs +++ b/crates/feedback/src/feedback_editor.rs @@ -13,7 +13,6 @@ use gpui::{ elements::{ChildView, Flex, Label, ParentElement}, serde_json, AnyViewHandle, AppContext, Element, ElementBox, Entity, ModelHandle, MutableAppContext, PromptLevel, RenderContext, Task, View, ViewContext, ViewHandle, - WeakViewHandle, }; use isahc::Request; use language::Buffer; @@ -24,7 +23,6 @@ use serde::Serialize; use workspace::{ item::{Item, ItemHandle}, searchable::{SearchableItem, SearchableItemHandle}, - smallvec::SmallVec, AppState, Workspace, }; @@ -259,16 +257,10 @@ impl Item for FeedbackEditor { self.editor.for_each_project_item(cx, f) } - fn to_item_events(_: &Self::Event) -> SmallVec<[workspace::item::ItemEvent; 2]> { - SmallVec::new() - } - fn is_singleton(&self, _: &AppContext) -> bool { true } - fn set_nav_history(&mut self, _: workspace::ItemNavHistory, _: &mut ViewContext) {} - fn can_save(&self, _: &AppContext) -> bool { true } @@ -295,7 +287,7 @@ impl Item for FeedbackEditor { _: ModelHandle, _: &mut ViewContext, ) -> Task> { - unreachable!("reload should not have been called") + Task::Ready(Some(Ok(()))) } fn clone_on_split( @@ -322,20 +314,6 @@ impl Item for FeedbackEditor { )) } - fn serialized_item_kind() -> Option<&'static str> { - None - } - - fn deserialize( - _: ModelHandle, - _: WeakViewHandle, - _: workspace::WorkspaceId, - _: workspace::ItemId, - _: &mut ViewContext, - ) -> Task>> { - unreachable!() - } - fn as_searchable(&self, handle: &ViewHandle) -> Option> { Some(Box::new(handle.clone())) } diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs index 58caf7d45d7518d093181d9d892cbe9eabc144fc..8f27089d9db89021ec0e57cce600bcef3f007dad 100644 --- a/crates/terminal_view/src/terminal_view.rs +++ b/crates/terminal_view/src/terminal_view.rs @@ -21,7 +21,7 @@ use gpui::{ use project::{LocalWorktree, Project}; use serde::Deserialize; use settings::{Settings, TerminalBlink, WorkingDirectory}; -use smallvec::SmallVec; +use smallvec::{smallvec, SmallVec}; use smol::Timer; use terminal::{ alacritty_terminal::{ @@ -616,43 +616,6 @@ impl Item for TerminalView { None } - fn for_each_project_item(&self, _: &AppContext, _: &mut dyn FnMut(usize, &dyn project::Item)) {} - - fn is_singleton(&self, _cx: &gpui::AppContext) -> bool { - false - } - - fn set_nav_history(&mut self, _: workspace::ItemNavHistory, _: &mut ViewContext) {} - - fn can_save(&self, _cx: &gpui::AppContext) -> bool { - false - } - - fn save( - &mut self, - _project: gpui::ModelHandle, - _cx: &mut ViewContext, - ) -> gpui::Task> { - unreachable!("save should not have been called"); - } - - fn save_as( - &mut self, - _project: gpui::ModelHandle, - _abs_path: std::path::PathBuf, - _cx: &mut ViewContext, - ) -> gpui::Task> { - unreachable!("save_as should not have been called"); - } - - fn reload( - &mut self, - _project: gpui::ModelHandle, - _cx: &mut ViewContext, - ) -> gpui::Task> { - gpui::Task::ready(Ok(())) - } - fn is_dirty(&self, _cx: &gpui::AppContext) -> bool { self.has_bell() } @@ -667,10 +630,10 @@ impl Item for TerminalView { fn to_item_events(event: &Self::Event) -> SmallVec<[ItemEvent; 2]> { match event { - Event::BreadcrumbsChanged => smallvec::smallvec![ItemEvent::UpdateBreadcrumbs], - Event::TitleChanged | Event::Wakeup => smallvec::smallvec![ItemEvent::UpdateTab], - Event::CloseTerminal => smallvec::smallvec![ItemEvent::CloseItem], - _ => smallvec::smallvec![], + Event::BreadcrumbsChanged => smallvec![ItemEvent::UpdateBreadcrumbs], + Event::TitleChanged | Event::Wakeup => smallvec![ItemEvent::UpdateTab], + Event::CloseTerminal => smallvec![ItemEvent::CloseItem], + _ => smallvec![], } } diff --git a/crates/theme_testbench/src/theme_testbench.rs b/crates/theme_testbench/src/theme_testbench.rs index 573e95e198df1f8444d3290856b49a03626b869e..ad01f51a1535f8d49928f272f42c49624c858ab7 100644 --- a/crates/theme_testbench/src/theme_testbench.rs +++ b/crates/theme_testbench/src/theme_testbench.rs @@ -11,12 +11,8 @@ use gpui::{ }; use project::Project; use settings::Settings; -use smallvec::SmallVec; use theme::{ColorScheme, Layer, Style, StyleSet}; -use workspace::{ - item::{Item, ItemEvent}, - register_deserializable_item, Pane, Workspace, -}; +use workspace::{item::Item, register_deserializable_item, Pane, Workspace}; actions!(theme, [DeployThemeTestbench]); @@ -314,47 +310,6 @@ impl Item for ThemeTestbench { .boxed() } - fn for_each_project_item(&self, _: &AppContext, _: &mut dyn FnMut(usize, &dyn project::Item)) {} - - fn is_singleton(&self, _: &AppContext) -> bool { - false - } - - fn set_nav_history(&mut self, _: workspace::ItemNavHistory, _: &mut ViewContext) {} - - fn can_save(&self, _: &AppContext) -> bool { - false - } - - fn save( - &mut self, - _: gpui::ModelHandle, - _: &mut ViewContext, - ) -> gpui::Task> { - unreachable!("save should not have been called"); - } - - fn save_as( - &mut self, - _: gpui::ModelHandle, - _: std::path::PathBuf, - _: &mut ViewContext, - ) -> gpui::Task> { - unreachable!("save_as should not have been called"); - } - - fn reload( - &mut self, - _: gpui::ModelHandle, - _: &mut ViewContext, - ) -> gpui::Task> { - gpui::Task::ready(Ok(())) - } - - fn to_item_events(_: &Self::Event) -> SmallVec<[ItemEvent; 2]> { - SmallVec::new() - } - fn serialized_item_kind() -> Option<&'static str> { Some("ThemeTestBench") } diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs index 0e28976151d8ae64119071851528b9cfdbfb6b2b..a80b9f8d83d9dc4d407b337a944537143e24581e 100644 --- a/crates/workspace/src/item.rs +++ b/crates/workspace/src/item.rs @@ -49,9 +49,11 @@ pub trait Item: View { } fn tab_content(&self, detail: Option, style: &theme::Tab, cx: &AppContext) -> ElementBox; - fn for_each_project_item(&self, _: &AppContext, _: &mut dyn FnMut(usize, &dyn project::Item)); - fn is_singleton(&self, cx: &AppContext) -> bool; - fn set_nav_history(&mut self, _: ItemNavHistory, _: &mut ViewContext); + fn for_each_project_item(&self, _: &AppContext, _: &mut dyn FnMut(usize, &dyn project::Item)) {} + fn is_singleton(&self, _cx: &AppContext) -> bool { + false + } + fn set_nav_history(&mut self, _: ItemNavHistory, _: &mut ViewContext) {} fn clone_on_split(&self, _workspace_id: WorkspaceId, _: &mut ViewContext) -> Option where Self: Sized, @@ -64,23 +66,31 @@ pub trait Item: View { fn has_conflict(&self, _: &AppContext) -> bool { false } - fn can_save(&self, cx: &AppContext) -> bool; + fn can_save(&self, _cx: &AppContext) -> bool { + false + } fn save( &mut self, - project: ModelHandle, - cx: &mut ViewContext, - ) -> Task>; + _project: ModelHandle, + _cx: &mut ViewContext, + ) -> Task> { + unimplemented!("save() must be implemented if can_save() returns true") + } fn save_as( &mut self, - project: ModelHandle, - abs_path: PathBuf, - cx: &mut ViewContext, - ) -> Task>; + _project: ModelHandle, + _abs_path: PathBuf, + _cx: &mut ViewContext, + ) -> Task> { + unimplemented!("save_as() must be implemented if can_save() returns true") + } fn reload( &mut self, - project: ModelHandle, - cx: &mut ViewContext, - ) -> Task>; + _project: ModelHandle, + _cx: &mut ViewContext, + ) -> Task> { + unimplemented!("reload() must be implemented if can_save() returns true") + } fn git_diff_recalc( &mut self, _project: ModelHandle, @@ -88,7 +98,9 @@ pub trait Item: View { ) -> Task> { Task::ready(Ok(())) } - fn to_item_events(event: &Self::Event) -> SmallVec<[ItemEvent; 2]>; + fn to_item_events(_event: &Self::Event) -> SmallVec<[ItemEvent; 2]> { + SmallVec::new() + } fn should_close_item_on_event(_: &Self::Event) -> bool { false } @@ -124,15 +136,21 @@ pub trait Item: View { fn added_to_workspace(&mut self, _workspace: &mut Workspace, _cx: &mut ViewContext) {} - fn serialized_item_kind() -> Option<&'static str>; + fn serialized_item_kind() -> Option<&'static str> { + None + } fn deserialize( - project: ModelHandle, - workspace: WeakViewHandle, - workspace_id: WorkspaceId, - item_id: ItemId, - cx: &mut ViewContext, - ) -> Task>>; + _project: ModelHandle, + _workspace: WeakViewHandle, + _workspace_id: WorkspaceId, + _item_id: ItemId, + _cx: &mut ViewContext, + ) -> Task>> { + unimplemented!( + "deserialize() must be implemented if serialized_item_kind() returns Some(_)" + ) + } } pub trait ItemHandle: 'static + fmt::Debug { diff --git a/crates/workspace/src/shared_screen.rs b/crates/workspace/src/shared_screen.rs index b3e107c81b0030b763326ac16c806c1c8c2aa0af..43e7f24f627f23ae9b7507077f512a65c93068a2 100644 --- a/crates/workspace/src/shared_screen.rs +++ b/crates/workspace/src/shared_screen.rs @@ -1,23 +1,18 @@ use crate::{ - item::ItemEvent, persistence::model::ItemId, Item, ItemNavHistory, Pane, Workspace, WorkspaceId, + item::{Item, ItemEvent}, + ItemNavHistory, WorkspaceId, }; -use anyhow::{anyhow, Result}; use call::participant::{Frame, RemoteVideoTrack}; use client::{proto::PeerId, User}; use futures::StreamExt; use gpui::{ elements::*, geometry::{rect::RectF, vector::vec2f}, - AppContext, Entity, ModelHandle, MouseButton, RenderContext, Task, View, ViewContext, - ViewHandle, WeakViewHandle, + AppContext, Entity, MouseButton, RenderContext, Task, View, ViewContext, }; -use project::Project; use settings::Settings; use smallvec::SmallVec; -use std::{ - path::PathBuf, - sync::{Arc, Weak}, -}; +use std::sync::{Arc, Weak}; pub enum Event { Close, @@ -130,12 +125,6 @@ impl Item for SharedScreen { .boxed() } - fn for_each_project_item(&self, _: &AppContext, _: &mut dyn FnMut(usize, &dyn project::Item)) {} - - fn is_singleton(&self, _: &AppContext) -> bool { - false - } - fn set_nav_history(&mut self, history: ItemNavHistory, _: &mut ViewContext) { self.nav_history = Some(history); } @@ -149,52 +138,9 @@ impl Item for SharedScreen { Some(Self::new(&track, self.peer_id, self.user.clone(), cx)) } - fn can_save(&self, _: &AppContext) -> bool { - false - } - - fn save( - &mut self, - _: ModelHandle, - _: &mut ViewContext, - ) -> Task> { - Task::ready(Err(anyhow!("Item::save called on SharedScreen"))) - } - - fn save_as( - &mut self, - _: ModelHandle, - _: PathBuf, - _: &mut ViewContext, - ) -> Task> { - Task::ready(Err(anyhow!("Item::save_as called on SharedScreen"))) - } - - fn reload( - &mut self, - _: ModelHandle, - _: &mut ViewContext, - ) -> Task> { - Task::ready(Err(anyhow!("Item::reload called on SharedScreen"))) - } - fn to_item_events(event: &Self::Event) -> SmallVec<[ItemEvent; 2]> { match event { Event::Close => smallvec::smallvec!(ItemEvent::CloseItem), } } - - fn serialized_item_kind() -> Option<&'static str> { - None - } - - fn deserialize( - _project: ModelHandle, - _workspace: WeakViewHandle, - _workspace_id: WorkspaceId, - _item_id: ItemId, - _cx: &mut ViewContext, - ) -> Task>> { - unreachable!("Shared screen can not be deserialized") - } } diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index d61fc3774c45b02c0077481a172cc78f150244bf..2c08b5417a4c073a77bcb871cef6a5cafdac5067 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -1589,13 +1589,17 @@ impl Workspace { } let item = pane.read(cx).active_item()?; - let new_pane = self.add_pane(cx); - if let Some(clone) = item.clone_on_split(self.database_id(), cx.as_mut()) { - Pane::add_item(self, &new_pane, clone, true, true, None, cx); - } - self.center.split(&pane, &new_pane, direction).unwrap(); + let maybe_pane_handle = + if let Some(clone) = item.clone_on_split(self.database_id(), cx.as_mut()) { + let new_pane = self.add_pane(cx); + Pane::add_item(self, &new_pane, clone, true, true, None, cx); + self.center.split(&pane, &new_pane, direction).unwrap(); + Some(new_pane) + } else { + None + }; cx.notify(); - Some(new_pane) + maybe_pane_handle } pub fn split_pane_with_item(&mut self, action: &SplitWithItem, cx: &mut ViewContext) {