From 9bb24ad1ab84d71f082307fe88ae1c96fe926d19 Mon Sep 17 00:00:00 2001
From: Mehdi Abedi <30735843+areux@users.noreply.github.com>
Date: Wed, 14 Feb 2024 10:53:15 +0000
Subject: [PATCH] Allow numbers as second input event (#8471)

* Make sure pending key list is empty when count handling

This will allow using numbers as second key event.

* count handling; add an exception for 'g'

* Lookup the key event before considering a number as count

* Avoid the allocation of another vec for the pending keys

---------

Co-authored-by: x <x@torrent>
---
 helix-term/src/keymap.rs    | 9 +++++++++
 helix-term/src/ui/editor.rs | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index d9297e08dc34..975274ed1d73 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -303,6 +303,15 @@ impl Keymaps {
         self.sticky.as_ref()
     }
 
+    pub fn contains_key(&self, mode: Mode, key: KeyEvent) -> bool {
+        let keymaps = &*self.map();
+        let keymap = &keymaps[&mode];
+        keymap
+            .search(self.pending())
+            .and_then(KeyTrie::node)
+            .is_some_and(|node| node.contains_key(&key))
+    }
+
     /// Lookup `key` in the keymap to try and find a command to execute. Escape
     /// key cancels pending keystrokes. If there are no pending keystrokes but a
     /// sticky node is in use, it will be cleared.
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index fef62a292910..bb749d2e7522 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -903,7 +903,9 @@ impl EditorView {
     fn command_mode(&mut self, mode: Mode, cxt: &mut commands::Context, event: KeyEvent) {
         match (event, cxt.editor.count) {
             // count handling
-            (key!(i @ '0'), Some(_)) | (key!(i @ '1'..='9'), _) => {
+            (key!(i @ '0'), Some(_)) | (key!(i @ '1'..='9'), _)
+                if !self.keymaps.contains_key(mode, event) =>
+            {
                 let i = i.to_digit(10).unwrap() as usize;
                 cxt.editor.count =
                     std::num::NonZeroUsize::new(cxt.editor.count.map_or(i, |c| c.get() * 10 + i));