github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-01 22:57:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix parsing of single-digit function keys

Browse Source
This commit is contained in:
Johannes Altmanninger 2024-04-08 17:33:26 +02:00
parent 7fd018e851
commit d025b245f6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/key.rs
View File

@ -233,6 +233,7 @@ pub(crate) fn parse_keys(value: &wstr) -> Result<Vec<Key>, WString> {
&& !value.contains('-')
&& !value.contains(KEY_SEPARATOR)
&& !KEY_NAMES.iter().any(|(_codepoint, name)| name == value))
&& value.as_char_slice()[0] != 'F'
|| (first == '\x1b' || first == ascii_control(first))
{
// Hack: treat as legacy syntax (meaning: not comma separated) if
@ -282,9 +283,8 @@ pub(crate) fn parse_keys(value: &wstr) -> Result<Vec<Key>, WString> {
Ok(n) if (1..=12).contains(&n) => function_key(u32::try_from(n).unwrap()),
_ => {
return Err(wgettext_fmt!(
"only F1 through F12 are supported, not '%s'",
"only F1 through F12 are supported, not 'F%s'",
num,
full_key_name
));
}
};

7
src/tests/key.rs
View File

@ -1,4 +1,4 @@
use crate::key::{self, ctrl, parse_keys, Key};
use crate::key::{self, ctrl, function_key, parse_keys, Key};
use crate::wchar::prelude::*;
#[test]
@ -10,4 +10,9 @@ fn test_parse_key() {
assert_eq!(parse_keys(L!("\x1b")), Ok(vec![Key::from_raw(key::Escape)]));
assert_eq!(parse_keys(L!("ctrl-a")), Ok(vec![ctrl('a')]));
assert_eq!(parse_keys(L!("\x01")), Ok(vec![ctrl('a')]));
assert!(parse_keys(L!("F0")).is_err());
assert_eq!(
parse_keys(L!("F1")),
Ok(vec![Key::from_raw(function_key(1))])
);
}