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

feat: add prepend_rules and append_rules for [icon] (#670)

Browse source
This commit is contained in:
grig-iv 2024-02-13 11:30:55 +03:00 • committed by GitHub
parent 8bf0d6428f
commit b027487d12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
yazi-config/src/keymap/keymap.rs
View file

@ -52,24 +52,6 @@ impl<'de> Deserialize<'de> for Keymap {
#[rustfmt::skip] #[rustfmt::skip]
Preset::mix(&mut shadow.completion.keymap, shadow.completion.prepend_keymap, shadow.completion.append_keymap); Preset::mix(&mut shadow.completion.keymap, shadow.completion.prepend_keymap, shadow.completion.append_keymap);
// TODO: remove this when v0.2.3 is released --
if !shadow.input.keymap.iter().any(|c| c.on() == "<Backspace>") {
println!(
"WARNING: Default keybinding for `<Backspace>` is missing, please add a `{}` to the `[input]` section of `keymap.toml`.
In Yazi v0.2.0, `<Backspace>` previously hardcoded within the input component has been moved to `keymap.toml` to allow users to customize it.",
r#"{ on = [ "<Backspace>" ], exec = "backspace" }"#
);
}
// TODO: -- remove this when v0.2.3 is released
// TODO: remove this when v0.2.3 is released --
if shadow.manager.keymap.iter().any(|c| c.exec().contains("--empty=name")) {
println!(
"WARNING: `rename --empty=name` is deprecated in Yazi v0.2.2, please use `rename --empty=stem` instead.",
);
}
// TODO: -- remove this when v0.2.3 is released
Ok(Self { Ok(Self {
manager: shadow.manager.keymap, manager: shadow.manager.keymap,
tasks: shadow.tasks.keymap, tasks: shadow.tasks.keymap,

11
yazi-config/src/theme/icon.rs
View file

@ -1,7 +1,7 @@
use serde::{Deserialize, Deserializer}; use serde::{Deserialize, Deserializer};
use super::Style; use super::Style;
use crate::{theme::{Color, StyleShadow}, Pattern}; use crate::{preset::Preset, theme::{Color, StyleShadow}, Pattern};
pub struct Icon { pub struct Icon {
pub name: Pattern, pub name: Pattern,
@ -17,6 +17,10 @@ impl Icon {
#[derive(Deserialize)] #[derive(Deserialize)]
struct IconOuter { struct IconOuter {
rules: Vec<IconRule>, rules: Vec<IconRule>,
#[serde(default)]
prepend_rules: Vec<IconRule>,
#[serde(default)]
append_rules: Vec<IconRule>,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
struct IconRule { struct IconRule {
@ -26,8 +30,11 @@ impl Icon {
fg: Option<Color>, fg: Option<Color>,
} }
let mut outer = IconOuter::deserialize(deserializer)?;
Preset::mix(&mut outer.rules, outer.prepend_rules, outer.append_rules);
Ok( Ok(
IconOuter::deserialize(deserializer)? outer
.rules .rules
.into_iter() .into_iter()
.map(|r| Icon { .map(|r| Icon {