extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-17 02:50:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add F1-F12 key support (#866)

Browse Source 
* Add F1-F12 key support

* Fix error reporting: keybinding parser

* Reject more than one character
This commit is contained in:
Stefan Holderbach 2022-01-28 19:14:51 +01:00 committed by GitHub
parent e11ac9f6f8
commit 3f9fa28ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/reedline_config.rs
View File

@ -231,8 +231,8 @@ fn add_keybinding(
"control | alt | shift" => KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT, "control | alt | shift" => KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT,
_ => { _ => {
return Err(ShellError::UnsupportedConfigValue( return Err(ShellError::UnsupportedConfigValue(
keybinding.modifier.into_abbreviated_string(config),
"CONTROL, SHIFT, ALT or NONE".to_string(), "CONTROL, SHIFT, ALT or NONE".to_string(),
keybinding.modifier.into_abbreviated_string(config),
keybinding.modifier.span()?, keybinding.modifier.span()?,
)) ))
} }
@ -247,14 +247,19 @@ fn add_keybinding(
"backspace" => KeyCode::Backspace, "backspace" => KeyCode::Backspace,
"enter" => KeyCode::Enter, "enter" => KeyCode::Enter,
c if c.starts_with("char_") => { c if c.starts_with("char_") => {
let char = c.replace("char_", ""); let mut char_iter = c.chars().skip(5);
let char = char.chars().next().ok_or({ let pos1 = char_iter.next();
ShellError::UnsupportedConfigValue( let pos2 = char_iter.next();
let char = match (pos1, pos2) {
(Some(char), None) => Ok(char),
_ => Err(ShellError::UnsupportedConfigValue(
"char_<CHAR: unicode codepoint>".to_string(),
c.to_string(), c.to_string(),
"char_ plus char".to_string(),
keybinding.keycode.span()?, keybinding.keycode.span()?,
) )),
})?; }?;
KeyCode::Char(char) KeyCode::Char(char)
} }
"down" => KeyCode::Down, "down" => KeyCode::Down,
@ -269,13 +274,24 @@ fn add_keybinding(
"backtab" => KeyCode::BackTab, "backtab" => KeyCode::BackTab,
"delete" => KeyCode::Delete, "delete" => KeyCode::Delete,
"insert" => KeyCode::Insert, "insert" => KeyCode::Insert,
// TODO: Add KeyCode::F(u8) for function keys c if c.starts_with('f') => {
let fn_num: u8 = c[1..]
.parse()
.ok()
.filter(|num| matches!(num, 1..=12))
.ok_or(ShellError::UnsupportedConfigValue(
"(f1|f2|...|f12)".to_string(),
format!("unknown function key: {}", c),
keybinding.keycode.span()?,
))?;
KeyCode::F(fn_num)
}
"null" => KeyCode::Null, "null" => KeyCode::Null,
"esc" | "escape" => KeyCode::Esc, "esc" | "escape" => KeyCode::Esc,
_ => { _ => {
return Err(ShellError::UnsupportedConfigValue( return Err(ShellError::UnsupportedConfigValue(
keybinding.keycode.into_abbreviated_string(config),
"crossterm KeyCode".to_string(), "crossterm KeyCode".to_string(),
keybinding.keycode.into_abbreviated_string(config),
keybinding.keycode.span()?, keybinding.keycode.span()?,
)) ))
} }
@ -375,8 +391,8 @@ fn parse_event(value: Value, config: &Config) -> Result<ReedlineEvent, ShellErro
} }
} }
v => Err(ShellError::UnsupportedConfigValue( v => Err(ShellError::UnsupportedConfigValue(
v.into_abbreviated_string(config),
"record or list of records".to_string(), "record or list of records".to_string(),
v.into_abbreviated_string(config),
v.span()?, v.span()?,
)), )),
} }
@ -464,8 +480,8 @@ fn parse_edit(edit: &Value, config: &Config) -> Result<EditCommand, ShellError>
} }
e => { e => {
return Err(ShellError::UnsupportedConfigValue( return Err(ShellError::UnsupportedConfigValue(
e.to_string(),
"reedline EditCommand".to_string(), "reedline EditCommand".to_string(),
e.to_string(),
edit.span()?, edit.span()?,
)) ))
} }
@ -473,8 +489,8 @@ fn parse_edit(edit: &Value, config: &Config) -> Result<EditCommand, ShellError>
} }
e => { e => {
return Err(ShellError::UnsupportedConfigValue( return Err(ShellError::UnsupportedConfigValue(
e.into_abbreviated_string(config),
"record with EditCommand".to_string(), "record with EditCommand".to_string(),
e.into_abbreviated_string(config),
edit.span()?, edit.span()?,
)) ))
} }