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: allows shorthand forms like <C-S-x> as <C-X> (#1448)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2024-08-09 16:55:07 +08:00 • committed by GitHub
parent c8add31606
commit 5f923e8706
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yazi-config/preset/keymap.toml
View file

@ -231,7 +231,7 @@ keymap = [
{ on = "<End>", run = "move 999", desc = "Move to the EOL" },
# Delete
{ on = "<Backspace>", run = "backspace", desc = "Delete the character before the cursor" },
{ on = "<Backspace>", run = "backspace", desc = "Delete the character before the cursor" },
{ on = "<Delete>", run = "backspace --under", desc = "Delete the character under the cursor" },
{ on = "<C-h>", run = "backspace", desc = "Delete the character before the cursor" },
{ on = "<C-d>", run = "backspace --under", desc = "Delete the character under the cursor" },

14
yazi-config/src/keymap/key.rs
View file

@ -67,9 +67,8 @@ impl FromStr for Key {
let mut key = Self::default();
if !s.starts_with('<') || !s.ends_with('>') {
let c = s.chars().next().unwrap();
key.code = KeyCode::Char(c);
key.shift = c.is_ascii_uppercase();
key.code = KeyCode::Char(s.chars().next().unwrap());
key.shift = matches!(key.code, KeyCode::Char(c) if c.is_ascii_uppercase());
return Ok(key);
}
@ -118,7 +117,11 @@ impl FromStr for Key {
"esc" => key.code = KeyCode::Esc,
_ => match next {
s if it.peek().is_none() => key.code = KeyCode::Char(s.chars().next().unwrap()),
s if it.peek().is_none() => {
let c = s.chars().next().unwrap();
key.shift |= c.is_ascii_uppercase();
key.code = KeyCode::Char(if key.shift { c.to_ascii_uppercase() } else { c });
}
s => bail!("unknown key: {s}"),
},
}
@ -134,7 +137,6 @@ impl FromStr for Key {
impl Display for Key {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
if let Some(c) = self.plain() {
let c = if self.shift { c.to_ascii_uppercase() } else { c };
return if c == ' ' { write!(f, "<Space>") } else { f.write_char(c) };
}
@ -190,7 +192,7 @@ impl Display for Key {
KeyCode::Char(' ') => "Space",
KeyCode::Char(c) => {
f.write_char(if self.shift { c.to_ascii_uppercase() } else { c })?;
f.write_char(c)?;
""
}
_ => "Unknown",