Encapsulate CommandPaletteFilter
and CommandPaletteInterceptor
(#9402)
This PR refactors the `CommandPaletteFilter` and `CommandPaletteInterceptor` to better encapsulate their internals. Previously these globals and their fields were publicly accessible, which meant that there was a lot of reaching in and making modifications. These changes should make it easier to add additional consumers of these hooks (right now they're primarily used by Vim mode). Release Notes: - N/A
This commit is contained in:
parent
d311a4b840
commit
55f4c8e51b
6 changed files with 164 additions and 56 deletions
|
@ -14,4 +14,5 @@ doctest = false
|
|||
|
||||
[dependencies]
|
||||
collections.workspace = true
|
||||
derive_more.workspace = true
|
||||
gpui.workspace = true
|
||||
|
|
|
@ -1,24 +1,142 @@
|
|||
//! Provides hooks for customizing the behavior of the command palette.
|
||||
|
||||
#![deny(missing_docs)]
|
||||
|
||||
use std::any::TypeId;
|
||||
|
||||
use collections::HashSet;
|
||||
use derive_more::{Deref, DerefMut};
|
||||
use gpui::{Action, AppContext, Global};
|
||||
|
||||
/// Initializes the command palette hooks.
|
||||
pub fn init(cx: &mut AppContext) {
|
||||
cx.set_global(GlobalCommandPaletteFilter::default());
|
||||
cx.set_global(GlobalCommandPaletteInterceptor::default());
|
||||
}
|
||||
|
||||
/// A filter for the command palette.
|
||||
#[derive(Default)]
|
||||
pub struct CommandPaletteFilter {
|
||||
pub hidden_namespaces: HashSet<&'static str>,
|
||||
pub hidden_action_types: HashSet<TypeId>,
|
||||
hidden_namespaces: HashSet<&'static str>,
|
||||
hidden_action_types: HashSet<TypeId>,
|
||||
}
|
||||
|
||||
impl Global for CommandPaletteFilter {}
|
||||
#[derive(Deref, DerefMut, Default)]
|
||||
struct GlobalCommandPaletteFilter(CommandPaletteFilter);
|
||||
|
||||
pub struct CommandPaletteInterceptor(
|
||||
pub Box<dyn Fn(&str, &AppContext) -> Option<CommandInterceptResult>>,
|
||||
);
|
||||
impl Global for GlobalCommandPaletteFilter {}
|
||||
|
||||
impl Global for CommandPaletteInterceptor {}
|
||||
impl CommandPaletteFilter {
|
||||
/// Returns the global [`CommandPaletteFilter`], if one is set.
|
||||
pub fn try_global(cx: &AppContext) -> Option<&CommandPaletteFilter> {
|
||||
cx.try_global::<GlobalCommandPaletteFilter>()
|
||||
.map(|filter| &filter.0)
|
||||
}
|
||||
|
||||
/// Returns a mutable reference to the global [`CommandPaletteFilter`].
|
||||
pub fn global_mut(cx: &mut AppContext) -> &mut Self {
|
||||
cx.global_mut::<GlobalCommandPaletteFilter>()
|
||||
}
|
||||
|
||||
/// Updates the global [`CommandPaletteFilter`] using the given closure.
|
||||
pub fn update_global<F, R>(cx: &mut AppContext, update: F) -> R
|
||||
where
|
||||
F: FnOnce(&mut Self, &mut AppContext) -> R,
|
||||
{
|
||||
cx.update_global(|this: &mut GlobalCommandPaletteFilter, cx| update(&mut this.0, cx))
|
||||
}
|
||||
|
||||
/// Returns whether the given [`Action`] is hidden by the filter.
|
||||
pub fn is_hidden(&self, action: &dyn Action) -> bool {
|
||||
let name = action.name();
|
||||
let namespace = name.split("::").next().unwrap_or("malformed action name");
|
||||
|
||||
self.hidden_namespaces.contains(namespace)
|
||||
|| self.hidden_action_types.contains(&action.type_id())
|
||||
}
|
||||
|
||||
/// Hides all actions in the given namespace.
|
||||
pub fn hide_namespace(&mut self, namespace: &'static str) {
|
||||
self.hidden_namespaces.insert(namespace);
|
||||
}
|
||||
|
||||
/// Shows all actions in the given namespace.
|
||||
pub fn show_namespace(&mut self, namespace: &'static str) {
|
||||
self.hidden_namespaces.remove(namespace);
|
||||
}
|
||||
|
||||
/// Hides all actions with the given types.
|
||||
pub fn hide_action_types(&mut self, action_types: &[TypeId]) {
|
||||
self.hidden_action_types.extend(action_types);
|
||||
}
|
||||
|
||||
/// Shows all actions with the given types.
|
||||
pub fn show_action_types<'a>(&mut self, action_types: impl Iterator<Item = &'a TypeId>) {
|
||||
for action_type in action_types {
|
||||
self.hidden_action_types.remove(action_type);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The result of intercepting a command palette command.
|
||||
pub struct CommandInterceptResult {
|
||||
/// The action produced as a result of the interception.
|
||||
pub action: Box<dyn Action>,
|
||||
// TODO: Document this field.
|
||||
#[allow(missing_docs)]
|
||||
pub string: String,
|
||||
// TODO: Document this field.
|
||||
#[allow(missing_docs)]
|
||||
pub positions: Vec<usize>,
|
||||
}
|
||||
|
||||
/// An interceptor for the command palette.
|
||||
#[derive(Default)]
|
||||
pub struct CommandPaletteInterceptor(
|
||||
Option<Box<dyn Fn(&str, &AppContext) -> Option<CommandInterceptResult>>>,
|
||||
);
|
||||
|
||||
#[derive(Default)]
|
||||
struct GlobalCommandPaletteInterceptor(CommandPaletteInterceptor);
|
||||
|
||||
impl Global for GlobalCommandPaletteInterceptor {}
|
||||
|
||||
impl CommandPaletteInterceptor {
|
||||
/// Returns the global [`CommandPaletteInterceptor`], if one is set.
|
||||
pub fn try_global(cx: &AppContext) -> Option<&CommandPaletteInterceptor> {
|
||||
cx.try_global::<GlobalCommandPaletteInterceptor>()
|
||||
.map(|interceptor| &interceptor.0)
|
||||
}
|
||||
|
||||
/// Updates the global [`CommandPaletteInterceptor`] using the given closure.
|
||||
pub fn update_global<F, R>(cx: &mut AppContext, update: F) -> R
|
||||
where
|
||||
F: FnOnce(&mut Self, &mut AppContext) -> R,
|
||||
{
|
||||
cx.update_global(|this: &mut GlobalCommandPaletteInterceptor, cx| update(&mut this.0, cx))
|
||||
}
|
||||
|
||||
/// Intercepts the given query from the command palette.
|
||||
pub fn intercept(&self, query: &str, cx: &AppContext) -> Option<CommandInterceptResult> {
|
||||
let Some(handler) = self.0.as_ref() else {
|
||||
return None;
|
||||
};
|
||||
|
||||
(handler)(query, cx)
|
||||
}
|
||||
|
||||
/// Clears the global interceptor.
|
||||
pub fn clear(&mut self) {
|
||||
self.0 = None;
|
||||
}
|
||||
|
||||
/// Sets the global interceptor.
|
||||
///
|
||||
/// This will override the previous interceptor, if it exists.
|
||||
pub fn set(
|
||||
&mut self,
|
||||
handler: Box<dyn Fn(&str, &AppContext) -> Option<CommandInterceptResult>>,
|
||||
) {
|
||||
self.0 = Some(handler);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue