git.iko.soy/helix
on master help sign in
Make parse_macro work for "-" outside "<..>" (#8475)
574f821Bjorn Ove Hay Andersen
helix-view/src/input.rs+59−1
compare with master
unifiedsplit
@@ -549,7 +549,7 @@ pub fn parse_macro(keys_str: &str) -> anyhow::Result<Vec<KeyEvent>> {
549 if c == ">" {
549 if c == ">" {
550 keys_res = Err(anyhow!("Unmatched '>'"));
550 keys_res = Err(anyhow!("Unmatched '>'"));
551 } else if c != "<" {
551 } else if c != "<" {
552− keys.push(c);
552+ keys.push(if c == "-" { keys::MINUS } else { c });
553 i += end_i;
553 i += end_i;
554 } else {
554 } else {
555 match s.find('>').context("'>' expected") {
555 match s.find('>').context("'>' expected") {
@@ -813,6 +813,64 @@ mod test {
813 },
813 },
814 ])
814 ])
815 );
815 );
816+
817+ assert_eq!(
818+ parse_macro(":w aa-bb.txt<ret>").ok(),
819+ Some(vec![
820+ KeyEvent {
821+ code: KeyCode::Char(':'),
822+ modifiers: KeyModifiers::NONE,
823+ },
824+ KeyEvent {
825+ code: KeyCode::Char('w'),
826+ modifiers: KeyModifiers::NONE,
827+ },
828+ KeyEvent {
829+ code: KeyCode::Char(' '),
830+ modifiers: KeyModifiers::NONE,
831+ },
832+ KeyEvent {
833+ code: KeyCode::Char('a'),
834+ modifiers: KeyModifiers::NONE,
835+ },
836+ KeyEvent {
837+ code: KeyCode::Char('a'),
838+ modifiers: KeyModifiers::NONE,
839+ },
840+ KeyEvent {
841+ code: KeyCode::Char('-'),
842+ modifiers: KeyModifiers::NONE,
843+ },
844+ KeyEvent {
845+ code: KeyCode::Char('b'),
846+ modifiers: KeyModifiers::NONE,
847+ },
848+ KeyEvent {
849+ code: KeyCode::Char('b'),
850+ modifiers: KeyModifiers::NONE,
851+ },
852+ KeyEvent {
853+ code: KeyCode::Char('.'),
854+ modifiers: KeyModifiers::NONE,
855+ },
856+ KeyEvent {
857+ code: KeyCode::Char('t'),
858+ modifiers: KeyModifiers::NONE,
859+ },
860+ KeyEvent {
861+ code: KeyCode::Char('x'),
862+ modifiers: KeyModifiers::NONE,
863+ },
864+ KeyEvent {
865+ code: KeyCode::Char('t'),
866+ modifiers: KeyModifiers::NONE,
867+ },
868+ KeyEvent {
869+ code: KeyCode::Enter,
870+ modifiers: KeyModifiers::NONE,
871+ },
872+ ])
873+ );
816 }
874 }
817
875
818 #[test]
876 #[test]