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

chore: use WindowContext in Workspace where it is a sufficient context type

Browse source
This commit is contained in:
Piotr Osiewicz 2024-01-21 14:12:28 +01:00
parent 29e74a648f
commit c3102feeeb
1 changed files with 24 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/workspace/src/workspace.rs
View file

@ -848,7 +848,7 @@ impl Workspace {
self.window_edited self.window_edited
} }
pub fn add_panel<T: Panel>(&mut self, panel: View<T>, cx: &mut ViewContext<Self>) { pub fn add_panel<T: Panel>(&mut self, panel: View<T>, cx: &mut WindowContext) {
let dock = match panel.position(cx) { let dock = match panel.position(cx) {
DockPosition::Left => &self.left_dock, DockPosition::Left => &self.left_dock,
DockPosition::Bottom => &self.bottom_dock, DockPosition::Bottom => &self.bottom_dock,
@ -1488,14 +1488,14 @@ impl Workspace {
item.to_any().downcast::<I>().ok() item.to_any().downcast::<I>().ok()
} }
fn active_project_path(&self, cx: &ViewContext<Self>) -> Option<ProjectPath> { fn active_project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
self.active_item(cx).and_then(|item| item.project_path(cx)) self.active_item(cx).and_then(|item| item.project_path(cx))
} }
pub fn save_active_item( pub fn save_active_item(
&mut self, &mut self,
save_intent: SaveIntent, save_intent: SaveIntent,
cx: &mut ViewContext<Self>, cx: &mut WindowContext,
) -> Task<Result<()>> { ) -> Task<Result<()>> {
let project = self.project.clone(); let project = self.project.clone();
let pane = self.active_pane(); let pane = self.active_pane();
@ -1503,7 +1503,7 @@ impl Workspace {
let item = pane.read(cx).active_item(); let item = pane.read(cx).active_item();
let pane = pane.downgrade(); let pane = pane.downgrade();
cx.spawn(|_, mut cx| async move { cx.spawn(|mut cx| async move {
if let Some(item) = item { if let Some(item) = item {
Pane::save_item(project, &pane, item_ix, item.as_ref(), save_intent, &mut cx) Pane::save_item(project, &pane, item_ix, item.as_ref(), save_intent, &mut cx)
.await .await
@ -1764,7 +1764,7 @@ impl Workspace {
} }
} }
pub fn add_item(&mut self, item: Box<dyn ItemHandle>, cx: &mut ViewContext<Self>) { pub fn add_item(&mut self, item: Box<dyn ItemHandle>, cx: &mut WindowContext) {
if let Some(text) = item.telemetry_event_text(cx) { if let Some(text) = item.telemetry_event_text(cx) {
self.client() self.client()
.telemetry() .telemetry()
@ -1846,7 +1846,7 @@ impl Workspace {
path: impl Into<ProjectPath>, path: impl Into<ProjectPath>,
pane: Option<WeakView<Pane>>, pane: Option<WeakView<Pane>>,
focus_item: bool, focus_item: bool,
cx: &mut ViewContext<Self>, cx: &mut WindowContext,
) -> Task<Result<Box<dyn ItemHandle>, anyhow::Error>> { ) -> Task<Result<Box<dyn ItemHandle>, anyhow::Error>> {
let pane = pane.unwrap_or_else(|| { let pane = pane.unwrap_or_else(|| {
self.last_active_center_pane.clone().unwrap_or_else(|| { self.last_active_center_pane.clone().unwrap_or_else(|| {
@ -1858,7 +1858,7 @@ impl Workspace {
}); });
let task = self.load_path(path.into(), cx); let task = self.load_path(path.into(), cx);
cx.spawn(move |_, mut cx| async move { cx.spawn(move |mut cx| async move {
let (project_entry_id, build_item) = task.await?; let (project_entry_id, build_item) = task.await?;
pane.update(&mut cx, |pane, cx| { pane.update(&mut cx, |pane, cx| {
pane.open_item(project_entry_id, focus_item, cx, build_item) pane.open_item(project_entry_id, focus_item, cx, build_item)
@ -1901,7 +1901,7 @@ impl Workspace {
fn load_path( fn load_path(
&mut self, &mut self,
path: ProjectPath, path: ProjectPath,
cx: &mut ViewContext<Self>, cx: &mut WindowContext,
) -> Task< ) -> Task<
Result<( Result<(
Option<ProjectEntryId>, Option<ProjectEntryId>,
@ -1910,7 +1910,7 @@ impl Workspace {
> { > {
let project = self.project().clone(); let project = self.project().clone();
let project_item = project.update(cx, |project, cx| project.open_path(path, cx)); let project_item = project.update(cx, |project, cx| project.open_path(path, cx));
cx.spawn(|_, mut cx| async move { cx.spawn(|mut cx| async move {
let (project_entry_id, project_item) = project_item.await?; let (project_entry_id, project_item) = project_item.await?;
let build_item = cx.update(|cx| { let build_item = cx.update(|cx| {
cx.default_global::<ProjectItemBuilders>() cx.default_global::<ProjectItemBuilders>()
@ -1980,7 +1980,7 @@ impl Workspace {
} }
} }
pub fn activate_item(&mut self, item: &dyn ItemHandle, cx: &mut ViewContext<Self>) -> bool { pub fn activate_item(&mut self, item: &dyn ItemHandle, cx: &mut WindowContext) -> bool {
let result = self.panes.iter().find_map(|pane| { let result = self.panes.iter().find_map(|pane| {
pane.read(cx) pane.read(cx)
.index_for_item(item) .index_for_item(item)
@ -2003,7 +2003,7 @@ impl Workspace {
} }
} }
pub fn activate_next_pane(&mut self, cx: &mut ViewContext<Self>) { pub fn activate_next_pane(&mut self, cx: &mut WindowContext) {
let panes = self.center.panes(); let panes = self.center.panes();
if let Some(ix) = panes.iter().position(|pane| **pane == self.active_pane) { if let Some(ix) = panes.iter().position(|pane| **pane == self.active_pane) {
let next_ix = (ix + 1) % panes.len(); let next_ix = (ix + 1) % panes.len();
@ -2012,7 +2012,7 @@ impl Workspace {
} }
} }
pub fn activate_previous_pane(&mut self, cx: &mut ViewContext<Self>) { pub fn activate_previous_pane(&mut self, cx: &mut WindowContext) {
let panes = self.center.panes(); let panes = self.center.panes();
if let Some(ix) = panes.iter().position(|pane| **pane == self.active_pane) { if let Some(ix) = panes.iter().position(|pane| **pane == self.active_pane) {
let prev_ix = cmp::min(ix.wrapping_sub(1), panes.len() - 1); let prev_ix = cmp::min(ix.wrapping_sub(1), panes.len() - 1);
@ -2024,7 +2024,7 @@ impl Workspace {
pub fn activate_pane_in_direction( pub fn activate_pane_in_direction(
&mut self, &mut self,
direction: SplitDirection, direction: SplitDirection,
cx: &mut ViewContext<Self>, cx: &mut WindowContext,
) { ) {
if let Some(pane) = self.find_pane_in_direction(direction, cx) { if let Some(pane) = self.find_pane_in_direction(direction, cx) {
cx.focus_view(pane); cx.focus_view(pane);
@ -2048,7 +2048,7 @@ impl Workspace {
fn find_pane_in_direction( fn find_pane_in_direction(
&mut self, &mut self,
direction: SplitDirection, direction: SplitDirection,
cx: &mut ViewContext<Self>, cx: &AppContext,
) -> Option<&View<Pane>> { ) -> Option<&View<Pane>> {
let Some(bounding_box) = self.center.bounding_box_for_pane(&self.active_pane) else { let Some(bounding_box) = self.center.bounding_box_for_pane(&self.active_pane) else {
return None; return None;
@ -2483,14 +2483,14 @@ impl Workspace {
.any(|state| state.leader_id == peer_id) .any(|state| state.leader_id == peer_id)
} }
fn active_item_path_changed(&mut self, cx: &mut ViewContext<Self>) { fn active_item_path_changed(&mut self, cx: &mut WindowContext) {
let active_entry = self.active_project_path(cx); let active_entry = self.active_project_path(cx);
self.project self.project
.update(cx, |project, cx| project.set_active_path(active_entry, cx)); .update(cx, |project, cx| project.set_active_path(active_entry, cx));
self.update_window_title(cx); self.update_window_title(cx);
} }
fn update_window_title(&mut self, cx: &mut ViewContext<Self>) { fn update_window_title(&mut self, cx: &mut WindowContext) {
let project = self.project().read(cx); let project = self.project().read(cx);
let mut title = String::new(); let mut title = String::new();
@ -2534,7 +2534,7 @@ impl Workspace {
cx.set_window_title(&title); cx.set_window_title(&title);
} }
fn update_window_edited(&mut self, cx: &mut ViewContext<Self>) { fn update_window_edited(&mut self, cx: &mut WindowContext) {
let is_edited = !self.project.read(cx).is_disconnected() let is_edited = !self.project.read(cx).is_disconnected()
&& self && self
.items(cx) .items(cx)
@ -2759,7 +2759,7 @@ impl Workspace {
Ok(()) Ok(())
} }
fn update_active_view_for_followers(&mut self, cx: &mut ViewContext<Self>) { fn update_active_view_for_followers(&mut self, cx: &mut WindowContext) {
let mut is_project_item = true; let mut is_project_item = true;
let mut update = proto::UpdateActiveView::default(); let mut update = proto::UpdateActiveView::default();
@ -2876,7 +2876,7 @@ impl Workspace {
&self, &self,
peer_id: PeerId, peer_id: PeerId,
pane: &View<Pane>, pane: &View<Pane>,
cx: &mut ViewContext<Self>, cx: &mut WindowContext,
) -> Option<View<SharedScreen>> { ) -> Option<View<SharedScreen>> {
let call = self.active_call()?; let call = self.active_call()?;
let room = call.read(cx).room()?.read(cx); let room = call.read(cx).room()?.read(cx);
@ -2993,7 +2993,7 @@ impl Workspace {
})); }));
} }
fn serialize_workspace(&self, cx: &mut ViewContext<Self>) { fn serialize_workspace(&self, cx: &mut WindowContext) {
fn serialize_pane_handle(pane_handle: &View<Pane>, cx: &WindowContext) -> SerializedPane { fn serialize_pane_handle(pane_handle: &View<Pane>, cx: &WindowContext) -> SerializedPane {
let (items, active) = { let (items, active) = {
let pane = pane_handle.read(cx); let pane = pane_handle.read(cx);
@ -3039,10 +3039,7 @@ impl Workspace {
} }
} }
fn build_serialized_docks( fn build_serialized_docks(this: &Workspace, cx: &mut WindowContext) -> DockStructure {
this: &Workspace,
cx: &mut ViewContext<Workspace>,
) -> DockStructure {
let left_dock = this.left_dock.read(cx); let left_dock = this.left_dock.read(cx);
let left_visible = left_dock.is_open(); let left_visible = left_dock.is_open();
let left_active_panel = left_dock let left_active_panel = left_dock
@ -3109,7 +3106,7 @@ impl Workspace {
docks, docks,
}; };
cx.spawn(|_, _| persistence::DB.save_workspace(serialized_workspace)) cx.spawn(|_| persistence::DB.save_workspace(serialized_workspace))
.detach(); .detach();
} }
} }
@ -3350,14 +3347,11 @@ impl Workspace {
self.modal_layer.read(cx).has_active_modal() self.modal_layer.read(cx).has_active_modal()
} }
pub fn active_modal<V: ManagedView + 'static>( pub fn active_modal<V: ManagedView + 'static>(&mut self, cx: &AppContext) -> Option<View<V>> {
&mut self,
cx: &ViewContext<Self>,
) -> Option<View<V>> {
self.modal_layer.read(cx).active_modal() self.modal_layer.read(cx).active_modal()
} }
pub fn toggle_modal<V: ModalView, B>(&mut self, cx: &mut ViewContext<Self>, build: B) pub fn toggle_modal<V: ModalView, B>(&mut self, cx: &mut WindowContext, build: B)
where where
B: FnOnce(&mut ViewContext<V>) -> V, B: FnOnce(&mut ViewContext<V>) -> V,
{ {