title_bar: Remove dependency on feedback

zed-industries · Nov 21, 2024 · 18913c7 · 18913c7
1 parent 4c7b48b
commit 18913c7
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
@@ -22,8 +22,8 @@ db.workspace = true
 editor.workspace = true
 futures.workspace = true
 gpui.workspace = true
-human_bytes = "0.4.1"
 http_client.workspace = true
+human_bytes = "0.4.1"
 language.workspace = true
 log.workspace = true
 menu.workspace = true
@@ -39,6 +39,7 @@ ui.workspace = true
 urlencoding = "2.1.2"
 util.workspace = true
 workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/feedback/src/feedback.rs b/crates/feedback/src/feedback.rs
@@ -5,8 +5,6 @@ use workspace::Workspace;
 
 pub mod feedback_modal;
 
-actions!(feedback, [GiveFeedback, SubmitFeedback]);
-
 mod system_specs;
 
 actions!(

diff --git a/crates/feedback/src/feedback_modal.rs b/crates/feedback/src/feedback_modal.rs
@@ -18,8 +18,9 @@ use serde_derive::Serialize;
 use ui::{prelude::*, Button, ButtonStyle, IconPosition, Tooltip};
 use util::ResultExt;
 use workspace::{DismissDecision, ModalView, Workspace};
+use zed_actions::feedback::GiveFeedback;
 
-use crate::{system_specs::SystemSpecs, GiveFeedback, OpenZedRepo};
+use crate::{system_specs::SystemSpecs, OpenZedRepo};
 
 // For UI testing purposes
 const SEND_SUCCESS_IN_DEV_MODE: bool = true;

diff --git a/crates/title_bar/Cargo.toml b/crates/title_bar/Cargo.toml
@@ -31,7 +31,6 @@ test-support = [
 auto_update.workspace = true
 call.workspace = true
 client.workspace = true
-feedback.workspace = true
 feature_flags.workspace = true
 gpui.workspace = true
 notifications.workspace = true

diff --git a/crates/title_bar/src/application_menu.rs b/crates/title_bar/src/application_menu.rs
@@ -116,7 +116,10 @@ impl Render for ApplicationMenu {
                                 url: "https://zed.dev/docs".into(),
                             }),
                         )
-                        .action("Give Feedback", Box::new(feedback::GiveFeedback))
+                        .action(
+                            "Give Feedback",
+                            Box::new(zed_actions::feedback::GiveFeedback),
+                        )
                         .action("Check for Updates", Box::new(auto_update::Check))
                         .action("View Telemetry", Box::new(zed_actions::OpenTelemetryLog))
                         .action(

diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
@@ -179,7 +179,7 @@ pub fn app_menus() -> Vec<Menu> {
                 MenuItem::action("View Telemetry", zed_actions::OpenTelemetryLog),
                 MenuItem::action("View Dependency Licenses", zed_actions::OpenLicenses),
                 MenuItem::action("Show Welcome", workspace::Welcome),
-                MenuItem::action("Give Feedback...", feedback::GiveFeedback),
+                MenuItem::action("Give Feedback...", zed_actions::feedback::GiveFeedback),
                 MenuItem::separator(),
                 MenuItem::action(
                     "Documentation",

diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
@@ -56,6 +56,12 @@ pub mod command_palette {
     actions!(command_palette, [Toggle]);
 }
 
+pub mod feedback {
+    use gpui::actions;
+
+    actions!(feedback, [GiveFeedback]);
+}
+
 pub mod theme_selector {
     use gpui::impl_actions;
     use serde::Deserialize;