mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 13:24:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Pass action instead of action argument to handlers

Browse source
This commit is contained in:
Antonio Scandurra 2021-08-23 12:00:31 +02:00
parent 86effd64a2
commit ab2977c65c
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gpui/src/app.rs
View file

@ -100,7 +100,7 @@ pub trait Action: 'static + AnyAction {
pub trait AnyAction { pub trait AnyAction {
fn id(&self) -> TypeId; fn id(&self) -> TypeId;
fn arg_as_any(&self) -> &dyn Any; fn as_any(&self) -> &dyn Any;
fn boxed_clone(&self) -> Box<dyn AnyAction>; fn boxed_clone(&self) -> Box<dyn AnyAction>;
fn boxed_clone_as_any(&self) -> Box<dyn Any>; fn boxed_clone_as_any(&self) -> Box<dyn Any>;
} }
@ -116,8 +116,8 @@ impl AnyAction for () {
TypeId::of::<()>() TypeId::of::<()>()
} }
fn arg_as_any(&self) -> &dyn Any { fn as_any(&self) -> &dyn Any {
&() self
} }
fn boxed_clone(&self) -> Box<dyn AnyAction> { fn boxed_clone(&self) -> Box<dyn AnyAction> {
@ -146,8 +146,8 @@ macro_rules! action {
std::any::TypeId::of::<$name>() std::any::TypeId::of::<$name>()
} }
fn arg_as_any(&self) -> &dyn std::any::Any { fn as_any(&self) -> &dyn std::any::Any {
&self.0 self
} }
fn boxed_clone(&self) -> Box<dyn $crate::AnyAction> { fn boxed_clone(&self) -> Box<dyn $crate::AnyAction> {
@ -175,8 +175,8 @@ macro_rules! action {
std::any::TypeId::of::<$name>() std::any::TypeId::of::<$name>()
} }
fn arg_as_any(&self) -> &dyn std::any::Any { fn as_any(&self) -> &dyn std::any::Any {
&() self
} }
fn boxed_clone(&self) -> Box<dyn $crate::AnyAction> { fn boxed_clone(&self) -> Box<dyn $crate::AnyAction> {
@ -768,13 +768,13 @@ impl MutableAppContext {
cx: &mut MutableAppContext, cx: &mut MutableAppContext,
window_id: usize, window_id: usize,
view_id: usize| { view_id: usize| {
let arg = action.arg_as_any().downcast_ref().unwrap(); let action = action.as_any().downcast_ref().unwrap();
let mut cx = ViewContext::new(cx, window_id, view_id); let mut cx = ViewContext::new(cx, window_id, view_id);
handler( handler(
view.as_any_mut() view.as_any_mut()
.downcast_mut() .downcast_mut()
.expect("downcast is type safe"), .expect("downcast is type safe"),
arg, action,
&mut cx, &mut cx,
); );
cx.halt_action_dispatch cx.halt_action_dispatch
@ -795,8 +795,8 @@ impl MutableAppContext {
F: 'static + FnMut(&A, &mut MutableAppContext), F: 'static + FnMut(&A, &mut MutableAppContext),
{ {
let handler = Box::new(move |action: &dyn AnyAction, cx: &mut MutableAppContext| { let handler = Box::new(move |action: &dyn AnyAction, cx: &mut MutableAppContext| {
let arg = action.arg_as_any().downcast_ref().unwrap(); let action = action.as_any().downcast_ref().unwrap();
handler(arg, cx); handler(action, cx);
}); });
self.global_actions self.global_actions