Restore namespace parameter to actions!

This does not yet fix `derive(Action)`, but will conflict with a lot so
wanted to merge quickly.

crates/activity_indicator2/src/activity_indicator.rs

@@ -14,7 +14,7 @@ use ui::h_stack;
 use util::ResultExt;
 use workspace::{item::ItemHandle, StatusItemView, Workspace};
 
-actions!(ShowErrorMessage);
+actions!(activity_indicator, [ShowErrorMessage]);
 
 const DOWNLOAD_ICON: &str = "icons/download.svg";
 const WARNING_ICON: &str = "icons/warning.svg";

crates/assistant2/src/assistant.rs

@@ -19,6 +19,8 @@ use std::{cmp::Reverse, ffi::OsStr, path::PathBuf, sync::Arc};
 use util::paths::CONVERSATIONS_DIR;
 
 actions!(
+    assistant,
+    [
         NewConversation,
         Assist,
         Split,
@@ -29,6 +31,7 @@ actions!(
         InlineAssist,
         ToggleIncludeConversation,
         ToggleRetrieveContext,
+    ]
 );
 
 #[derive(

crates/auto_update2/src/auto_update.rs

@@ -26,10 +26,13 @@ const POLL_INTERVAL: Duration = Duration::from_secs(60 * 60);
 
 //todo!(remove CheckThatAutoUpdaterWorks)
 actions!(
+    auto_update,
+    [
         Check,
         DismissErrorMessage,
         ViewReleaseNotes,
         CheckThatAutoUpdaterWorks
+    ]
 );
 
 #[derive(Serialize)]

crates/client2/src/client2.rs

@@ -70,7 +70,7 @@ pub const ZED_SECRET_CLIENT_TOKEN: &str = "618033988749894";
 pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(100);
 pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(5);
 
-actions!(SignIn, SignOut, Reconnect);
+actions!(client, [SignIn, SignOut, Reconnect]);
 
 pub fn init_settings(cx: &mut AppContext) {
     TelemetrySettings::register(cx);

crates/collab_ui2/src/channel_view.rs

@@ -26,7 +26,7 @@ use workspace::{
     ItemNavHistory, Pane, SaveIntent, ViewId, Workspace, WorkspaceId,
 };
 
-actions!(Deploy);
+actions!(collab, [Deploy]);
 
 pub fn init(cx: &mut AppContext) {
     register_followable_item::<ChannelView>(cx)

crates/collab_ui2/src/chat_panel.rs

@@ -75,7 +75,7 @@ pub enum Event {
     Dismissed,
 }
 
-actions!(ToggleFocus);
+actions!(chat_panel, [ToggleFocus]);
 
 impl ChatPanel {
     pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {

crates/collab_ui2/src/collab_panel.rs

@@ -123,6 +123,8 @@ pub struct OpenChannelNotes {
 // }
 
 actions!(
+    collab_panel,
+    [
         ToggleFocus,
         Remove,
         Secondary,
@@ -131,6 +133,7 @@ actions!(
         StartMoveChannel,
         MoveSelected,
         InsertSpace,
+    ]
 );
 
 // impl_actions!(

crates/collab_ui2/src/collab_panel/channel_modal.rs

@@ -16,10 +16,13 @@ use util::TryFutureExt;
 use workspace::ModalView;
 
 actions!(
+    channel_modal,
+    [
         SelectNextControl,
         ToggleMode,
         ToggleMemberAdmin,
         RemoveMember
+    ]
 );
 
 // pub fn init(cx: &mut AppContext) {

crates/collab_ui2/src/collab_titlebar_item.rs

@@ -20,11 +20,14 @@ const MAX_PROJECT_NAME_LENGTH: usize = 40;
 const MAX_BRANCH_NAME_LENGTH: usize = 40;
 
 actions!(
+    collab,
+    [
         ShareProject,
         UnshareProject,
         ToggleUserMenu,
         ToggleProjectMenu,
         SwitchBranch
+    ]
 );
 
 pub fn init(cx: &mut AppContext) {

crates/collab_ui2/src/collab_ui.rs

@@ -24,7 +24,10 @@ use settings::Settings;
 use util::ResultExt;
 use workspace::AppState;
 
-actions!(ToggleScreenSharing, ToggleMute, ToggleDeafen, LeaveCall);
+actions!(
+    collab,
+    [ToggleScreenSharing, ToggleMute, ToggleDeafen, LeaveCall]
+);
 
 pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
     CollaborationPanelSettings::register(cx);

crates/command_palette2/src/command_palette.rs

@@ -19,7 +19,7 @@ use util::{
 use workspace::{ModalView, Workspace};
 use zed_actions::OpenZedURL;
 
-actions!(Toggle);
+actions!(command_palette, [Toggle]);
 
 pub fn init(cx: &mut AppContext) {
     cx.set_global(HitCounts::default());

crates/copilot2/src/copilot2.rs

@@ -34,12 +34,15 @@ use util::{
 };
 
 actions!(
+    copilot,
+    [
         Suggest,
         NextSuggestion,
         PreviousSuggestion,
         Reinstall,
         SignIn,
         SignOut
+    ]
 );
 
 pub fn init(

crates/diagnostics2/src/diagnostics.rs

@@ -43,7 +43,7 @@ use workspace::{
     ItemNavHistory, Pane, ToolbarItemLocation, Workspace,
 };
 
-actions!(Deploy, ToggleWarnings);
+actions!(diagnostics, [Deploy, ToggleWarnings]);
 
 const CONTEXT_LINE_COUNT: u32 = 1;
 

crates/editor2/src/editor.rs

@@ -277,6 +277,8 @@ impl InlayId {
 }
 
 actions!(
+    editor,
+    [
         AddSelectionAbove,
         AddSelectionBelow,
         Backspace,
@@ -392,6 +394,7 @@ actions!(
         Undo,
         UndoSelection,
         UnfoldLines,
+    ]
 );
 
 enum DocumentHighlightRead {}

crates/editor2/src/hover_popover.rs

@@ -26,7 +26,7 @@ pub const MIN_POPOVER_CHARACTER_WIDTH: f32 = 20.;
 pub const MIN_POPOVER_LINE_HEIGHT: Pixels = px(4.);
 pub const HOVER_POPOVER_GAP: Pixels = px(10.);
 
-actions!(Hover);
+actions!(editor, [Hover]);
 
 /// Bindable action which uses the most recent selection head to trigger a hover
 pub fn hover(editor: &mut Editor, _: &Hover, cx: &mut ViewContext<Editor>) {

crates/feedback2/src/feedback2.rs

@@ -5,15 +5,18 @@ use workspace::Workspace;
 pub mod deploy_feedback_button;
 pub mod feedback_modal;
 
-actions!(GiveFeedback, SubmitFeedback);
+actions!(feedback, [GiveFeedback, SubmitFeedback]);
 
 mod system_specs;
 
 actions!(
+    zed,
+    [
         CopySystemSpecsIntoClipboard,
         FileBugReport,
         RequestFeature,
         OpenZedCommunityRepo
+    ]
 );
 
 pub fn init(cx: &mut AppContext) {

crates/file_finder2/src/file_finder.rs

@@ -19,7 +19,7 @@ use ui::{prelude::*, HighlightedLabel, ListItem};
 use util::{paths::PathLikeWithPosition, post_inc, ResultExt};
 use workspace::{ModalView, Workspace};
 
-actions!(Toggle);
+actions!(file_finder, [Toggle]);
 
 impl ModalView for FileFinder {}
 

crates/go_to_line2/src/go_to_line.rs

@@ -10,7 +10,7 @@ use ui::{h_stack, prelude::*, v_stack, Label};
 use util::paths::FILE_ROW_COLUMN_DELIMITER;
 use workspace::ModalView;
 
-actions!(Toggle);
+actions!(go_to_line, [Toggle]);
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(GoToLine::register).detach();

crates/gpui2/docs/key_dispatch.md

@@ -22,7 +22,7 @@ Actions are frequently unit structs, for which we have a macro. The above could
 
 ```rust
 mod menu {
-    actions!(MoveUp, MoveDown);
+    actions!(gpui, [MoveUp, MoveDown]);
 }
 ```
 

crates/gpui2/src/action.rs

@@ -158,17 +158,65 @@ impl ActionRegistry {
 /// To use more complex data types as actions, annotate your type with the #[action] macro.
 #[macro_export]
 macro_rules! actions {
-    () => {};
+    ($namespace:path, [ $($name:ident),* $(,)? ]) => {
-
+        $(
-    ( $name:ident ) => {
+            #[derive(::std::cmp::PartialEq, ::std::clone::Clone, ::std::default::Default, gpui::serde_derive::Deserialize)]
-        #[derive(::std::cmp::PartialEq, ::std::clone::Clone, ::std::default::Default, gpui::serde_derive::Deserialize, gpui::Action)]
             #[serde(crate = "gpui::serde")]
+            #[gpui::register_action]
             pub struct $name;
-    };
 
-    ( $name:ident, $($rest:tt)* ) => {
+            gpui::__impl_action!($namespace, $name,
-        actions!($name);
+                fn build(_: gpui::serde_json::Value) -> gpui::Result<::std::boxed::Box<dyn gpui::Action>> {
-        actions!($($rest)*);
+                    Ok(Box::new(Self))
+                }
+            );
+        )*
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __impl_action {
+    ($namespace:path, $name:ident, $build:item) => {
+        impl gpui::Action for $name {
+            fn name(&self) -> &'static str
+            {
+                concat!(
+                    stringify!($namespace),
+                    "::",
+                    stringify!($name),
+                )
+            }
+
+            // todo!() why is this needed in addition to name?
+            fn debug_name() -> &'static str
+            where
+                Self: ::std::marker::Sized
+            {
+                concat!(
+                    stringify!($namespace),
+                    "::",
+                    stringify!($name),
+                )
+            }
+
+            $build
+
+            fn partial_eq(&self, action: &dyn gpui::Action) -> bool {
+                action
+                    .as_any()
+                    .downcast_ref::<Self>()
+                    .map_or(false, |a| self == a)
+            }
+
+            fn boxed_clone(&self) ->  std::boxed::Box<dyn gpui::Action> {
+                ::std::boxed::Box::new(self.clone())
+            }
+
+            fn as_any(&self) -> &dyn ::std::any::Any {
+                self
+            }
+        }
     };
 }
 
@@ -186,5 +234,5 @@ pub fn remove_the_2(action_name: &str) -> String {
 mod no_action {
     use crate as gpui;
 
-    actions!(NoAction);
+    actions!(zed, [NoAction]);
 }

crates/gpui2/src/interactive.rs

@@ -302,7 +302,7 @@ mod test {
         focus_handle: FocusHandle,
     }
 
-    actions!(TestAction);
+    actions!(test, [TestAction]);
 
     impl Render for TestView {
         type Element = Stateful<Div>;

crates/gpui2/src/keymap/context.rs

@@ -293,11 +293,13 @@ mod tests {
     #[test]
     fn test_actions_definition() {
         {
-            actions!(A, B, C, D, E, F, G);
+            actions!(test, [A, B, C, D, E, F, G]);
         }
 
         {
             actions!(
+                test,
+                [
                 A,
                 B,
                 C,
@@ -305,6 +307,7 @@ mod tests {
                 E,
                 F,
                 G, // Don't wrap, test the trailing comma
+            ]
             );
         }
     }

crates/gpui2_macros/src/register_action.rs

@@ -78,7 +78,7 @@ pub(crate) fn register_action(type_name: &Ident) -> proc_macro2::TokenStream {
         #[doc(hidden)]
         fn #action_builder_fn_name() -> gpui::ActionData {
             gpui::ActionData {
-                name: ::std::any::type_name::<#type_name>(),
+                name: <#type_name as gpui::Action>::debug_name(),
                 type_id: ::std::any::TypeId::of::<#type_name>(),
                 build: <#type_name as gpui::Action>::build,
             }

crates/install_cli2/src/install_cli2.rs

@@ -3,7 +3,7 @@ use gpui::{actions, AsyncAppContext};
 use std::path::Path;
 use util::ResultExt;
 
-actions!(Install);
+actions!(cli, [Install]);
 
 pub async fn install_cli(cx: &AsyncAppContext) -> Result<()> {
     let cli_path = cx.update(|cx| cx.path_for_auxiliary_executable("cli"))??;

crates/language_selector2/src/language_selector.rs

@@ -16,7 +16,7 @@ use ui::{prelude::*, HighlightedLabel, ListItem};
 use util::ResultExt;
 use workspace::{ModalView, Workspace};
 
-actions!(Toggle);
+actions!(language_selector, [Toggle]);
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(LanguageSelector::register).detach();

crates/menu2/src/menu2.rs

@@ -10,6 +10,8 @@ use gpui::actions;
 pub fn init() {}
 
 actions!(
+    menu,
+    [
         Cancel,
         Confirm,
         SecondaryConfirm,
@@ -18,4 +20,5 @@ actions!(
         SelectFirst,
         SelectLast,
         ShowContextMenu
+    ]
 );

crates/outline2/src/outline.rs

@@ -22,7 +22,7 @@ use ui::{prelude::*, ListItem};
 use util::ResultExt;
 use workspace::{ModalView, Workspace};
 
-actions!(Toggle);
+actions!(outline, [Toggle]);
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(OutlineView::register).detach();

crates/project_panel2/src/project_panel.rs

@@ -103,6 +103,8 @@ pub struct EntryDetails {
 }
 
 actions!(
+    project_panel,
+    [
         ExpandSelectedEntry,
         CollapseSelectedEntry,
         CollapseAllEntries,
@@ -120,6 +122,7 @@ actions!(
         Open,
         ToggleFocus,
         NewSearchInDirectory,
+    ]
 );
 
 pub fn init_settings(cx: &mut AppContext) {

crates/recent_projects2/src/projects.rs

@@ -1 +1 @@
-gpui::actions!(OpenRecent);
+gpui::actions!(projects, [OpenRecent]);

crates/search2/src/buffer_search.rs

@@ -31,7 +31,7 @@ pub struct Deploy {
     pub focus: bool,
 }
 
-actions!(Dismiss, FocusEditor);
+actions!(buffer_search, [Dismiss, FocusEditor]);
 
 pub enum Event {
     UpdateLocation,

crates/search2/src/search.rs

@@ -22,6 +22,8 @@ pub fn init(cx: &mut AppContext) {
 }
 
 actions!(
+    search,
+    [
         CycleMode,
         ToggleWholeWord,
         ToggleCaseSensitive,
@@ -36,6 +38,7 @@ actions!(
         ActivateRegexMode,
         ReplaceAll,
         ReplaceNext,
+    ]
 );
 
 bitflags! {

crates/settings2/src/keymap_file.rs

@@ -1,7 +1,7 @@
 use crate::{settings_store::parse_json_with_comments, SettingsAssets};
 use anyhow::{anyhow, Context, Result};
 use collections::BTreeMap;
-use gpui::{actions, Action, AppContext, KeyBinding, SharedString};
+use gpui::{Action, AppContext, KeyBinding, SharedString};
 use schemars::{
     gen::{SchemaGenerator, SchemaSettings},
     schema::{InstanceType, Schema, SchemaObject, SingleOrVec, SubschemaValidation},
@@ -137,10 +137,8 @@ impl KeymapFile {
     }
 }
 
-actions!(NoAction);
-
 fn no_action() -> Box<dyn gpui::Action> {
-    NoAction.boxed_clone()
+    gpui::NoAction.boxed_clone()
 }
 
 #[cfg(test)]

crates/storybook2/src/stories/focus.rs

@@ -4,7 +4,7 @@ use gpui::{
 };
 use ui::prelude::*;
 
-actions!(ActionA, ActionB, ActionC);
+actions!(focus, [ActionA, ActionB, ActionC]);
 
 pub struct FocusStory {
     child_1_focus: FocusHandle,

crates/terminal2/src/terminal2.rs

@@ -59,6 +59,8 @@ use crate::mappings::{colors::to_alac_rgb, keys::to_esc_str};
 use lazy_static::lazy_static;
 
 actions!(
+    terminal,
+    [
         Clear,
         Copy,
         Paste,
@@ -66,6 +68,7 @@ actions!(
         SearchTest,
         SendText,
         SendKeystroke,
+    ]
 );
 
 ///Scrolling is unbearably sluggish by default. Alacritty supports a configurable

crates/terminal_view2/src/terminal_panel.rs

@@ -24,7 +24,7 @@ use anyhow::Result;
 
 const TERMINAL_PANEL_KEY: &'static str = "TerminalPanel";
 
-actions!(ToggleFocus);
+actions!(terminal_view, [ToggleFocus]);
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(

crates/theme_selector2/src/theme_selector.rs

@@ -13,7 +13,7 @@ use ui::{prelude::*, v_stack, ListItem};
 use util::ResultExt;
 use workspace::{ui::HighlightedLabel, ModalView, Workspace};
 
-actions!(Toggle, Reload);
+actions!(theme_selector, [Toggle, Reload]);
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(

crates/ui2/src/components/stories/context_menu.rs

@@ -4,7 +4,7 @@ use story::Story;
 use crate::prelude::*;
 use crate::{right_click_menu, ContextMenu, Label};
 
-actions!(PrintCurrentDate, PrintBestFood);
+actions!(context_menu, [PrintCurrentDate, PrintBestFood]);
 
 fn build_menu(cx: &mut WindowContext, header: impl Into<SharedString>) -> View<ContextMenu> {
     ContextMenu::build(cx, |menu, _| {

crates/ui2/src/components/stories/keybinding.rs

@@ -1,4 +1,5 @@
-use gpui::{actions, Div, Render};
+use gpui::NoAction;
+use gpui::{Div, Render};
 use itertools::Itertools;
 use story::Story;
 
@@ -7,8 +8,6 @@ use crate::KeyBinding;
 
 pub struct KeybindingStory;
 
-actions!(NoAction);
-
 pub fn binding(key: &str) -> gpui::KeyBinding {
     gpui::KeyBinding::new(key, NoAction {}, None)
 }

crates/welcome2/src/base_keymap_picker.rs

@@ -12,7 +12,7 @@ use ui::{prelude::*, ListItem};
 use util::ResultExt;
 use workspace::{ui::HighlightedLabel, ModalView, Workspace};
 
-actions!(ToggleBaseKeymapSelector);
+actions!(welcome, [ToggleBaseKeymapSelector]);
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(|workspace: &mut Workspace, _cx| {

crates/workspace2/src/dock.rs

@@ -770,7 +770,7 @@ pub mod test {
         pub focus_handle: FocusHandle,
         pub size: f32,
     }
-    actions!(ToggleTestPanel);
+    actions!(test, [ToggleTestPanel]);
 
     impl EventEmitter<PanelEvent> for TestPanel {}
 

crates/workspace2/src/pane.rs

@@ -87,8 +87,9 @@ pub struct CloseAllItems {
     pub save_intent: Option<SaveIntent>,
 }
 
-// todo!(These used to be under pane::{Action}. Are they now workspace::pane::{Action}?)
 actions!(
+    pane,
+    [
         ActivatePrevItem,
         ActivateNextItem,
         ActivateLastItem,
@@ -103,6 +104,7 @@ actions!(
         SplitUp,
         SplitRight,
         SplitDown,
+    ]
 );
 
 const MAX_NAVIGATION_HISTORY_LEN: usize = 1024;

crates/workspace2/src/workspace2.rs

@@ -91,6 +91,8 @@ lazy_static! {
 pub struct RemoveWorktreeFromProject(pub WorktreeId);
 
 actions!(
+    workspace,
+    [
         Open,
         NewFile,
         NewWindow,
@@ -115,6 +117,7 @@ actions!(
         ToggleRightDock,
         ToggleBottomDock,
         CloseAllDocks,
+    ]
 );
 
 #[derive(Clone, PartialEq)]

crates/zed2/src/zed2.rs

@@ -43,6 +43,8 @@ use workspace::{
 use zed_actions::{OpenBrowser, OpenZedURL};
 
 actions!(
+    zed,
+    [
         About,
         DebugElements,
         DecreaseBufferFontSize,
@@ -64,6 +66,7 @@ actions!(
         ShowAll,
         ToggleFullScreen,
         Zoom,
+    ]
 );
 
 pub fn build_window_options(