Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#RemoveThe2

Browse source
This commit is contained in:
Mikayla 2023-11-16 18:04:35 -08:00
parent 49d3e1cc4b
commit 432572c592
No known key found for this signature in database
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/command_palette2/src/command_palette.rs
View file

@ -47,7 +47,7 @@ impl CommandPalette {
.available_actions() .available_actions()
.into_iter() .into_iter()
.filter_map(|action| { .filter_map(|action| {
let name = action.name(); let name = gpui::remove_the_2(action.name());
let namespace = name.split("::").next().unwrap_or("malformed action name"); let namespace = name.split("::").next().unwrap_or("malformed action name");
if filter.is_some_and(|f| f.filtered_namespaces.contains(namespace)) { if filter.is_some_and(|f| f.filtered_namespaces.contains(namespace)) {
return None; return None;

17
crates/gpui2/src/action.rs
View file

@ -3,7 +3,10 @@ use anyhow::{anyhow, Context, Result};
use collections::HashMap; use collections::HashMap;
pub use no_action::NoAction; pub use no_action::NoAction;
use serde_json::json; use serde_json::json;
use std::any::{Any, TypeId}; use std::{
any::{Any, TypeId},
ops::Deref,
};
/// Actions are used to implement keyboard-driven UI. /// Actions are used to implement keyboard-driven UI.
/// When you declare an action, you can bind keys to the action in the keymap and /// When you declare an action, you can bind keys to the action in the keymap and
@ -111,7 +114,8 @@ impl ActionRegistry {
pub(crate) fn load_actions(&mut self) { pub(crate) fn load_actions(&mut self) {
for builder in __GPUI_ACTIONS { for builder in __GPUI_ACTIONS {
let action = builder(); let action = builder();
let name: SharedString = qualify_action(action.name).into(); //todo(remove)
let name: SharedString = remove_the_2(action.name).into();
self.builders_by_name.insert(name.clone(), action.build); self.builders_by_name.insert(name.clone(), action.build);
self.names_by_type_id.insert(action.type_id, name.clone()); self.names_by_type_id.insert(action.type_id, name.clone());
self.all_names.push(name); self.all_names.push(name);
@ -135,9 +139,11 @@ impl ActionRegistry {
name: &str, name: &str,
params: Option<serde_json::Value>, params: Option<serde_json::Value>,
) -> Result<Box<dyn Action>> { ) -> Result<Box<dyn Action>> {
//todo(remove)
let name = remove_the_2(name);
let build_action = self let build_action = self
.builders_by_name .builders_by_name
.get(name) .get(name.deref())
.ok_or_else(|| anyhow!("no action type registered for {}", name))?; .ok_or_else(|| anyhow!("no action type registered for {}", name))?;
(build_action)(params.unwrap_or_else(|| json!({}))) (build_action)(params.unwrap_or_else(|| json!({})))
.with_context(|| format!("Attempting to build action {}", name)) .with_context(|| format!("Attempting to build action {}", name))
@ -165,9 +171,8 @@ macro_rules! actions {
}; };
} }
/// This used by our macros to pre-process the action name deterministically //todo!(remove)
#[doc(hidden)] pub fn remove_the_2(action_name: &str) -> String {
pub fn qualify_action(action_name: &'static str) -> String {
let mut separator_matches = action_name.rmatch_indices("::"); let mut separator_matches = action_name.rmatch_indices("::");
separator_matches.next().unwrap(); separator_matches.next().unwrap();
let name_start_ix = separator_matches.next().map_or(0, |(ix, _)| ix + 2); let name_start_ix = separator_matches.next().map_or(0, |(ix, _)| ix + 2);