mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 03:17:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: allow to parse "-" as a key code (#12191)

Browse source 
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
This commit is contained in:
Tomas Zemanovic 2024-12-06 14:46:38 +00:00 • committed by GitHub
parent 28953ef40f
commit fc9968bd4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
helix-view/src/input.rs
View file

@ -387,6 +387,23 @@ impl std::str::FromStr for KeyEvent {
.then_some(KeyCode::F(function))
.ok_or_else(|| anyhow!("Invalid function key '{}'", function))?
}
// Checking that the last token is empty ensures that this branch is only taken if
// `-` is used as a code. For example this branch will not be taken for `S-` (which is
// missing a code).
_ if s.ends_with('-') && tokens.last().is_some_and(|t| t.is_empty()) => {
if s == "-" {
return Ok(KeyEvent {
code: KeyCode::Char('-'),
modifiers: KeyModifiers::empty(),
});
} else {
let suggestion = format!("{}-{}", s.trim_end_matches('-'), keys::MINUS);
return Err(anyhow!(
"Key '-' cannot be used with modifiers, use '{}' instead",
suggestion
));
}
}
invalid => return Err(anyhow!("Invalid key code '{}'", invalid)),
};
@ -661,6 +678,13 @@ mod test {
modifiers: KeyModifiers::NONE
}
);
assert_eq!(
str::parse::<KeyEvent>("-").unwrap(),
KeyEvent {
code: KeyCode::Char('-'),
modifiers: KeyModifiers::NONE,
}
);
}
#[test]
@ -721,6 +745,7 @@ mod test {
assert!(str::parse::<KeyEvent>("FU").is_err());
assert!(str::parse::<KeyEvent>("123").is_err());
assert!(str::parse::<KeyEvent>("S--").is_err());
assert!(str::parse::<KeyEvent>("S-").is_err());
assert!(str::parse::<KeyEvent>("S-percent").is_err());
}