diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 6b848292aa999ed8843e34bbe9dc5e1efccd31c8..ee507aa45f4294b912c0d4cc560ffa8a581b4a8a 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -195,7 +195,7 @@ "ctrl-shift-g": "search::SelectPreviousMatch", "ctrl-alt-/": "assistant::ToggleModelSelector", "ctrl-k h": "assistant::DeployHistory", - "ctrl-k l": "assistant::DeployPromptLibrary", + "ctrl-k l": "assistant::OpenPromptLibrary", "new": "assistant::NewChat", "ctrl-t": "assistant::NewChat", "ctrl-n": "assistant::NewChat" diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index 63f258c5bc5f846132ed5992153568e1d4232c2c..3cd69d1444ab1f6ffd5e7f09a430cf5304d4cf58 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -241,7 +241,7 @@ "cmd-shift-g": "search::SelectPreviousMatch", "cmd-alt-/": "assistant::ToggleModelSelector", "cmd-k h": "assistant::DeployHistory", - "cmd-k l": "assistant::DeployPromptLibrary", + "cmd-k l": "assistant::OpenPromptLibrary", "cmd-t": "assistant::NewChat", "cmd-n": "assistant::NewChat" } diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index 29833d1229942a3c2ef4e94ba77ae437484969ce..6621899b7c401a23702b860135bea1c839ee0cb0 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -38,7 +38,7 @@ use workspace::{ dock::{DockPosition, Panel, PanelEvent}, pane, DraggedSelection, Pane, ShowConfiguration, ToggleZoom, Workspace, }; -use zed_actions::assistant::{DeployPromptLibrary, InlineAssist, ToggleFocus}; +use zed_actions::assistant::{InlineAssist, OpenPromptLibrary, ToggleFocus}; pub fn init(cx: &mut App) { workspace::FollowableViewRegistry::register::(cx); @@ -259,7 +259,7 @@ impl AssistantPanel { menu.context(focus_handle.clone()) .action("New Chat", Box::new(NewChat)) .action("History", Box::new(DeployHistory)) - .action("Prompt Library", Box::new(DeployPromptLibrary)) + .action("Prompt Library", Box::new(OpenPromptLibrary)) .action("Configure", Box::new(ShowConfiguration)) .action(zoom_label, Box::new(ToggleZoom)) })) @@ -1028,7 +1028,7 @@ impl AssistantPanel { fn deploy_prompt_library( &mut self, - _: &DeployPromptLibrary, + _: &OpenPromptLibrary, _window: &mut Window, cx: &mut Context, ) { diff --git a/crates/assistant2/src/assistant_configuration.rs b/crates/assistant2/src/assistant_configuration.rs index c03b7c13d5b3a7b562de9819e53654ff74d6ca80..7a072516be2212eaaea98ef4f3d2c4d755458a40 100644 --- a/crates/assistant2/src/assistant_configuration.rs +++ b/crates/assistant2/src/assistant_configuration.rs @@ -9,7 +9,7 @@ use ui::{ prelude::*, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Switch, Tooltip, }; use util::ResultExt as _; -use zed_actions::assistant::DeployPromptLibrary; +use zed_actions::assistant::OpenPromptLibrary; use zed_actions::ExtensionCategoryFilter; pub struct AssistantConfiguration { @@ -374,7 +374,7 @@ impl Render for AssistantConfiguration { .icon_size(IconSize::Small) .icon_position(IconPosition::Start) .on_click(|_event, window, cx| { - window.dispatch_action(DeployPromptLibrary.boxed_clone(), cx) + window.dispatch_action(OpenPromptLibrary.boxed_clone(), cx) }), ), ) diff --git a/crates/assistant2/src/assistant_panel.rs b/crates/assistant2/src/assistant_panel.rs index c38aaff44fada737f03078657cd5a310df2b3a65..3c08bb60b4d5ed260df2a0ad8132c44eb29ad80e 100644 --- a/crates/assistant2/src/assistant_panel.rs +++ b/crates/assistant2/src/assistant_panel.rs @@ -14,9 +14,9 @@ use client::zed_urls; use editor::{Editor, MultiBuffer}; use fs::Fs; use gpui::{ - prelude::*, Action, AnyElement, App, AsyncWindowContext, Corner, Entity, EventEmitter, - FocusHandle, Focusable, FontWeight, KeyContext, Pixels, Subscription, Task, UpdateGlobal, - WeakEntity, + action_with_deprecated_aliases, prelude::*, Action, AnyElement, App, AsyncWindowContext, + Corner, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, KeyContext, Pixels, + Subscription, Task, UpdateGlobal, WeakEntity, }; use language::LanguageRegistry; use language_model::{LanguageModelProviderTosView, LanguageModelRegistry}; @@ -29,7 +29,7 @@ use ui::{prelude::*, ContextMenu, KeyBinding, PopoverMenu, PopoverMenuHandle, Ta use util::ResultExt as _; use workspace::dock::{DockPosition, Panel, PanelEvent}; use workspace::Workspace; -use zed_actions::assistant::{DeployPromptLibrary, ToggleFocus}; +use zed_actions::assistant::ToggleFocus; use crate::active_thread::ActiveThread; use crate::assistant_configuration::{AssistantConfiguration, AssistantConfigurationEvent}; @@ -43,6 +43,12 @@ use crate::{ OpenHistory, }; +action_with_deprecated_aliases!( + assistant, + OpenPromptLibrary, + ["assistant::DeployPromptLibrary"] +); + pub fn init(cx: &mut App) { cx.observe_new( |workspace: &mut Workspace, _window, _cx: &mut Context| { @@ -65,6 +71,14 @@ pub fn init(cx: &mut App) { panel.update(cx, |panel, cx| panel.new_prompt_editor(window, cx)); } }) + .register_action(|workspace, _: &OpenPromptLibrary, window, cx| { + if let Some(panel) = workspace.panel::(cx) { + workspace.focus_panel::(window, cx); + panel.update(cx, |panel, cx| { + panel.deploy_prompt_library(&OpenPromptLibrary, window, cx) + }); + } + }) .register_action(|workspace, _: &OpenConfiguration, window, cx| { if let Some(panel) = workspace.panel::(cx) { workspace.focus_panel::(window, cx); @@ -303,7 +317,7 @@ impl AssistantPanel { fn deploy_prompt_library( &mut self, - _: &DeployPromptLibrary, + _: &OpenPromptLibrary, _window: &mut Window, cx: &mut Context, ) { diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs index 8463fc07d00987ce374b2681e4cd4ca80f17e40c..40a2292ba808a782b4630ffea66051ae5f659e7e 100644 --- a/crates/zed_actions/src/lib.rs +++ b/crates/zed_actions/src/lib.rs @@ -188,7 +188,7 @@ pub mod assistant { use schemars::JsonSchema; use serde::Deserialize; - actions!(assistant, [ToggleFocus, DeployPromptLibrary]); + actions!(assistant, [ToggleFocus, OpenPromptLibrary]); #[derive(Clone, Default, Deserialize, PartialEq, JsonSchema)] #[serde(deny_unknown_fields)]