mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix test

Browse source
This commit is contained in:
sxyazi 2024-07-25 07:53:01 +08:00
parent e5cc2d3682
commit 9ff25120a8
No known key found for this signature in database
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
yazi-config/src/keymap/control.rs
View file

@ -1,4 +1,4 @@
use std::{borrow::Cow, collections::VecDeque, sync::LazyLock}; use std::{borrow::Cow, collections::VecDeque, sync::OnceLock};
use regex::Regex; use regex::Regex;
use serde::Deserialize; use serde::Deserialize;
@ -6,7 +6,7 @@ use yazi_shared::event::Cmd;
use super::Key; use super::Key;
static RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\s+").unwrap()); static RE: OnceLock<Regex> = OnceLock::new();
#[derive(Debug, Default, Deserialize)] #[derive(Debug, Default, Deserialize)]
pub struct Control { pub struct Control {
@ -26,11 +26,14 @@ impl Control {
pub fn on(&self) -> String { self.on.iter().map(ToString::to_string).collect() } pub fn on(&self) -> String { self.on.iter().map(ToString::to_string).collect() }
pub fn run(&self) -> String { pub fn run(&self) -> String {
RE.replace_all(&self.run.iter().map(|c| c.to_string()).collect::<Vec<_>>().join("; "), " ") RE.get_or_init(|| Regex::new(r"\s+").unwrap())
.replace_all(&self.run.iter().map(|c| c.to_string()).collect::<Vec<_>>().join("; "), " ")
.into_owned() .into_owned()
} }
pub fn desc(&self) -> Option<Cow<str>> { self.desc.as_ref().map(|s| RE.replace_all(s, " ")) } pub fn desc(&self) -> Option<Cow<str>> {
self.desc.as_ref().map(|s| RE.get_or_init(|| Regex::new(r"\s+").unwrap()).replace_all(s, " "))
}
pub fn desc_or_run(&self) -> Cow<str> { self.desc().unwrap_or_else(|| self.run().into()) } pub fn desc_or_run(&self) -> Cow<str> { self.desc().unwrap_or_else(|| self.run().into()) }