suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clippy

pull/10977/head
Evgeniy Tatarkin 2025-01-06 13:26:29 +03:00
parent bb62dad76f
commit 94b5e0c210
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
helix-view/src/input.rs
View File

@ -338,23 +338,21 @@ impl std::str::FromStr for KeyEvent {
KeyCode::from_str(tokens.pop().ok_or_else(|| anyhow!("Missing key code"))?)
{
code
} else {
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);
anyhow::bail!(
"Key '-' cannot be used with modifiers, use '{}' instead",
suggestion
)
}
} else 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 {
anyhow::bail!("Invalid key code '{}'", s)
let suggestion = format!("{}-{}", s.trim_end_matches('-'), keys::MINUS);
anyhow::bail!(
"Key '-' cannot be used with modifiers, use '{}' instead",
suggestion
)
}
} else {
anyhow::bail!("Invalid key code '{}'", s)
};
let mut modifiers = KeyModifiers::empty();
for token in tokens {