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

Make parse_macro work for "-" outside "<..>" (#8475)

Browse source 
* Translate  to   when a part of the outher string in

* Changed the if a little
This commit is contained in:
Bjorn Ove Hay Andersen 2023-10-12 14:09:57 +02:00 • committed by GitHub
parent 07a006d1d5
commit 574f821308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -549,7 +549,7 @@ pub fn parse_macro(keys_str: &str) -> anyhow::Result<Vec<KeyEvent>> {
if c == ">" { if c == ">" {
keys_res = Err(anyhow!("Unmatched '>'")); keys_res = Err(anyhow!("Unmatched '>'"));
} else if c != "<" { } else if c != "<" {
keys.push(c); keys.push(if c == "-" { keys::MINUS } else { c });
i += end_i; i += end_i;
} else { } else {
match s.find('>').context("'>' expected") { match s.find('>').context("'>' expected") {
@ -813,6 +813,64 @@ mod test {
}, },
]) ])
); );
assert_eq!(
parse_macro(":w aa-bb.txt<ret>").ok(),
Some(vec![
KeyEvent {
code: KeyCode::Char(':'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('w'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char(' '),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('a'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('a'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('-'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('b'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('b'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('.'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('t'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('x'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Char('t'),
modifiers: KeyModifiers::NONE,
},
KeyEvent {
code: KeyCode::Enter,
modifiers: KeyModifiers::NONE,
},
])
);
} }
#[test] #[test]