diff --git a/yazi-config/src/keymap/keymap.rs b/yazi-config/src/keymap/keymap.rs index f3b7adcff..c5f755b94 100644 --- a/yazi-config/src/keymap/keymap.rs +++ b/yazi-config/src/keymap/keymap.rs @@ -52,24 +52,6 @@ impl<'de> Deserialize<'de> for Keymap { #[rustfmt::skip] 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() == "") { - println!( - "WARNING: Default keybinding for `` is missing, please add a `{}` to the `[input]` section of `keymap.toml`. -In Yazi v0.2.0, `` previously hardcoded within the input component has been moved to `keymap.toml` to allow users to customize it.", - r#"{ on = [ "" ], 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 { manager: shadow.manager.keymap, tasks: shadow.tasks.keymap, diff --git a/yazi-config/src/theme/icon.rs b/yazi-config/src/theme/icon.rs index 3898334ba..3b2bd3f23 100644 --- a/yazi-config/src/theme/icon.rs +++ b/yazi-config/src/theme/icon.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Deserializer}; use super::Style; -use crate::{theme::{Color, StyleShadow}, Pattern}; +use crate::{preset::Preset, theme::{Color, StyleShadow}, Pattern}; pub struct Icon { pub name: Pattern, @@ -16,7 +16,11 @@ impl Icon { { #[derive(Deserialize)] struct IconOuter { - rules: Vec, + rules: Vec, + #[serde(default)] + prepend_rules: Vec, + #[serde(default)] + append_rules: Vec, } #[derive(Deserialize)] struct IconRule { @@ -26,8 +30,11 @@ impl Icon { fg: Option, } + let mut outer = IconOuter::deserialize(deserializer)?; + Preset::mix(&mut outer.rules, outer.prepend_rules, outer.append_rules); + Ok( - IconOuter::deserialize(deserializer)? + outer .rules .into_iter() .map(|r| Icon {