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

Simplify actions macro.

Browse source
This commit is contained in:
Nathan Sobo 2023-11-07 21:48:47 -07:00
parent fdc9ea7f9b
commit 2a55b0dbfb
3 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/gpui2/src/action.rs
View file

@ -137,7 +137,8 @@ pub fn all_action_names() -> MappedRwLockReadGuard<'static, [SharedString]> {
})
}
// actions defines structs that can be used as actions.
/// Defines unit structs that can be used as actions.
/// To use more complex data types as actions, annotate your type with the #[action] macro.
#[macro_export]
macro_rules! actions {
() => {};
@ -148,21 +149,10 @@ macro_rules! actions {
pub struct $name;
};
( $name:ident { $($token:tt)* } ) => {
#[gpui::register_action]
#[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug, ::std::cmp::PartialEq, $crate::serde::Deserialize)]
pub struct $name { $($token)* }
};
( $name:ident, $($rest:tt)* ) => {
actions!($name);
actions!($($rest)*);
};
( $name:ident { $($token:tt)* }, $($rest:tt)* ) => {
actions!($name { $($token)* });
actions!($($rest)*);
};
}
#[derive(Clone, Debug, Default, Eq, PartialEq)]
@ -408,17 +398,17 @@ mod tests {
#[test]
fn test_actions_definition() {
{
actions!(A, B { field: i32 }, C, D, E, F {}, G);
actions!(A, B, C, D, E, F, G);
}
{
actions!(
A,
B { field: i32 },
B,
C,
D,
E,
F {},
F,
G, // Don't wrap, test the trailing comma
);
}