Register menu2 actions using actions macro

Max Brunsfeld created 2 years ago

Change summary

Cargo.lock                |  2 +-
crates/menu2/Cargo.toml   |  4 ++--
crates/menu2/src/menu2.rs | 37 ++++++++++++-------------------------
3 files changed, 15 insertions(+), 28 deletions(-)

Detailed changes

Cargo.lock

@@ -4987,8 +4987,8 @@ dependencies = [
 name = "menu2"
 version = "0.1.0"
 dependencies = [
+ "gpui2",
  "serde",
- "serde_derive",
 ]
 
 [[package]]

crates/menu2/Cargo.toml

@@ -9,5 +9,5 @@ path = "src/menu2.rs"
 doctest = false
 
 [dependencies]
-serde.workspace = true
-serde_derive.workspace = true
+gpui = { package = "gpui2", path = "../gpui2" }
+serde = { workspace = true }

crates/menu2/src/menu2.rs

@@ -1,25 +1,12 @@
-use serde_derive::Deserialize;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct Cancel;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct Confirm;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct SecondaryConfirm;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct SelectPrev;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct SelectNext;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct SelectFirst;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct SelectLast;
-
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
-pub struct ShowContextMenu;
+use gpui::actions;
+
+actions!(
+    Cancel,
+    Confirm,
+    SecondaryConfirm,
+    SelectPrev,
+    SelectNext,
+    SelectFirst,
+    SelectLast,
+    ShowContextMenu
+);