From fa0739ee2ef98fba1f0ea25aecc6d000f8e64676 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 23 Aug 2021 15:07:50 -0700 Subject: [PATCH] Remove model and view specific observe/subscribe methods Co-Authored-By: Nathan Sobo --- gpui/src/app.rs | 56 ++++++++------------------------------- zed/src/editor.rs | 6 ++--- zed/src/file_finder.rs | 6 ++--- zed/src/theme_selector.rs | 4 +-- zed/src/workspace.rs | 10 +++---- 5 files changed, 24 insertions(+), 58 deletions(-) diff --git a/gpui/src/app.rs b/gpui/src/app.rs index 70116be8a8..85b04f8a6a 100644 --- a/gpui/src/app.rs +++ b/gpui/src/app.rs @@ -2097,40 +2097,6 @@ impl<'a, T: View> ViewContext<'a, T> { self.app.add_option_view(self.window_id, build_view) } - pub fn subscribe_to_model(&mut self, handle: &ModelHandle, callback: F) - where - E: Entity, - E::Event: 'static, - F: 'static + FnMut(&mut T, ModelHandle, &E::Event, &mut ViewContext), - { - self.subscribe(handle, callback) - } - - pub fn subscribe_to_view(&mut self, handle: &ViewHandle, callback: F) - where - V: View, - V::Event: 'static, - F: 'static + FnMut(&mut T, ViewHandle, &V::Event, &mut ViewContext), - { - self.subscribe(handle, callback) - } - - pub fn observe_model(&mut self, handle: &ModelHandle, callback: F) - where - S: Entity, - F: 'static + FnMut(&mut T, ModelHandle, &mut ViewContext), - { - self.observe(handle, callback) - } - - pub fn observe_view(&mut self, handle: &ViewHandle, callback: F) - where - S: View, - F: 'static + FnMut(&mut T, ViewHandle, &mut ViewContext), - { - self.observe(handle, callback) - } - pub fn subscribe(&mut self, handle: &H, mut callback: F) where E: Entity, @@ -2152,7 +2118,7 @@ impl<'a, T: View> ViewContext<'a, T> { }); } - fn observe(&mut self, handle: &H, mut callback: F) + pub fn observe(&mut self, handle: &H, mut callback: F) where E: Entity, H: Handle, @@ -2594,14 +2560,14 @@ impl ViewHandle { let mut cx = cx.cx.borrow_mut(); self.update(&mut *cx, |_, cx| { - cx.observe_view(self, { + cx.observe(self, { let mut tx = tx.clone(); move |_, _, _| { tx.blocking_send(()).ok(); } }); - cx.subscribe_to_view(self, { + cx.subscribe(self, { let mut tx = tx.clone(); move |_, _, _, _| { tx.blocking_send(()).ok(); @@ -3153,7 +3119,7 @@ mod tests { impl View { fn new(other: Option>, cx: &mut ViewContext) -> Self { if let Some(other) = other.as_ref() { - cx.subscribe_to_view(other, |me, _, event, _| { + cx.subscribe(other, |me, _, event, _| { me.events.push(format!("observed event {}", event)); }); } @@ -3327,15 +3293,15 @@ mod tests { let handle_3 = cx.add_model(|_| Model); handle_1.update(cx, |_, c| { - c.subscribe_to_view(&handle_2, move |me, _, event, c| { + c.subscribe(&handle_2, move |me, _, event, c| { me.events.push(*event); - c.subscribe_to_view(&handle_2b, |me, _, event, _| { + c.subscribe(&handle_2b, |me, _, event, _| { me.events.push(*event * 2); }); }); - c.subscribe_to_model(&handle_3, |me, _, event, _| { + c.subscribe(&handle_3, |me, _, event, _| { me.events.push(*event); }) }); @@ -3381,8 +3347,8 @@ mod tests { let observed_model = cx.add_model(|_| Model); observing_view.update(cx, |_, cx| { - cx.subscribe_to_view(&emitting_view, |_, _, _, _| {}); - cx.subscribe_to_model(&observed_model, |_, _, _, _| {}); + cx.subscribe(&emitting_view, |_, _, _, _| {}); + cx.subscribe(&observed_model, |_, _, _, _| {}); }); observing_model.update(cx, |_, cx| { cx.subscribe(&observed_model, |_, _, _, _| {}); @@ -3431,7 +3397,7 @@ mod tests { let model = cx.add_model(|_| Model::default()); view.update(cx, |_, c| { - c.observe_model(&model, |me, observed, c| { + c.observe(&model, |me, observed, c| { me.events.push(observed.read(c).count) }); }); @@ -3473,7 +3439,7 @@ mod tests { let observed_model = cx.add_model(|_| Model); observing_view.update(cx, |_, cx| { - cx.observe_model(&observed_model, |_, _, _| {}); + cx.observe(&observed_model, |_, _, _| {}); }); observing_model.update(cx, |_, cx| { cx.observe(&observed_model, |_, _, _| {}); diff --git a/zed/src/editor.rs b/zed/src/editor.rs index 49259f554c..67b352adf9 100644 --- a/zed/src/editor.rs +++ b/zed/src/editor.rs @@ -324,9 +324,9 @@ impl Editor { ) -> Self { let display_map = cx.add_model(|cx| DisplayMap::new(buffer.clone(), settings.borrow().clone(), None, cx)); - cx.observe_model(&buffer, Self::on_buffer_changed); - cx.subscribe_to_model(&buffer, Self::on_buffer_event); - cx.observe_model(&display_map, Self::on_display_map_changed); + cx.observe(&buffer, Self::on_buffer_changed); + cx.subscribe(&buffer, Self::on_buffer_event); + cx.observe(&display_map, Self::on_display_map_changed); let mut next_selection_id = 0; let selection_set_id = buffer.update(cx, |buffer, cx| { diff --git a/zed/src/file_finder.rs b/zed/src/file_finder.rs index 50bddb3717..793d823c3c 100644 --- a/zed/src/file_finder.rs +++ b/zed/src/file_finder.rs @@ -252,7 +252,7 @@ impl FileFinder { workspace.toggle_modal(cx, |cx, workspace| { let handle = cx.handle(); let finder = cx.add_view(|cx| Self::new(workspace.settings.clone(), handle, cx)); - cx.subscribe_to_view(&finder, Self::on_event); + cx.subscribe(&finder, Self::on_event); finder }); } @@ -281,10 +281,10 @@ impl FileFinder { workspace: ViewHandle, cx: &mut ViewContext, ) -> Self { - cx.observe_view(&workspace, Self::workspace_updated); + cx.observe(&workspace, Self::workspace_updated); let query_buffer = cx.add_view(|cx| Editor::single_line(settings.clone(), cx)); - cx.subscribe_to_view(&query_buffer, Self::on_query_editor_event); + cx.subscribe(&query_buffer, Self::on_query_editor_event); Self { handle: cx.handle().downgrade(), diff --git a/zed/src/theme_selector.rs b/zed/src/theme_selector.rs index 506d11a278..2318f2b78c 100644 --- a/zed/src/theme_selector.rs +++ b/zed/src/theme_selector.rs @@ -61,7 +61,7 @@ impl ThemeSelector { cx: &mut ViewContext, ) -> Self { let query_buffer = cx.add_view(|cx| Editor::single_line(settings.clone(), cx)); - cx.subscribe_to_view(&query_buffer, Self::on_query_editor_event); + cx.subscribe(&query_buffer, Self::on_query_editor_event); let mut this = Self { settings, @@ -86,7 +86,7 @@ impl ThemeSelector { cx, ) }); - cx.subscribe_to_view(&selector, Self::on_event); + cx.subscribe(&selector, Self::on_event); selector }); } diff --git a/zed/src/workspace.rs b/zed/src/workspace.rs index 0dffa81be9..f04e6dec1a 100644 --- a/zed/src/workspace.rs +++ b/zed/src/workspace.rs @@ -279,7 +279,7 @@ impl ItemViewHandle for ViewHandle { fn set_parent_pane(&self, pane: &ViewHandle, cx: &mut MutableAppContext) { pane.update(cx, |_, cx| { - cx.subscribe_to_view(self, |pane, item, event, cx| { + cx.subscribe(self, |pane, item, event, cx| { if T::should_activate_item_on_event(event) { if let Some(ix) = pane.item_index(&item) { pane.activate_item(ix, cx); @@ -358,7 +358,7 @@ impl Workspace { pub fn new(app_state: &AppState, cx: &mut ViewContext) -> Self { let pane = cx.add_view(|_| Pane::new(app_state.settings.clone())); let pane_id = pane.id(); - cx.subscribe_to_view(&pane, move |me, _, event, cx| { + cx.subscribe(&pane, move |me, _, event, cx| { me.handle_pane_event(pane_id, event, cx) }); cx.focus(&pane); @@ -526,7 +526,7 @@ impl Workspace { cx.spawn(|this, mut cx| async move { let worktree = Worktree::open_local(path, languages, fs, &mut cx).await?; this.update(&mut cx, |this, cx| { - cx.observe_model(&worktree, |_, _, cx| cx.notify()); + cx.observe(&worktree, |_, _, cx| cx.notify()); this.worktrees.insert(worktree.clone()); cx.notify(); }); @@ -835,7 +835,7 @@ impl Workspace { Worktree::open_remote(rpc.clone(), worktree_id, access_token, languages, &mut cx) .await?; this.update(&mut cx, |workspace, cx| { - cx.observe_model(&worktree, |_, _, cx| cx.notify()); + cx.observe(&worktree, |_, _, cx| cx.notify()); workspace.worktrees.insert(worktree); cx.notify(); }); @@ -854,7 +854,7 @@ impl Workspace { fn add_pane(&mut self, cx: &mut ViewContext) -> ViewHandle { let pane = cx.add_view(|_| Pane::new(self.settings.clone())); let pane_id = pane.id(); - cx.subscribe_to_view(&pane, move |me, _, event, cx| { + cx.subscribe(&pane, move |me, _, event, cx| { me.handle_pane_event(pane_id, event, cx) }); self.panes.push(pane.clone());