From 94eba0e66aa193c093b1d7eefc0e21391cb2485f Mon Sep 17 00:00:00 2001 From: adaliaramon <70635214+adaliaramon@users.noreply.github.com> Date: Wed, 20 Apr 2022 03:50:13 +0200 Subject: [PATCH] Added ability to remap 0 if it is not part of a count (#2174) * Added ability to remap 0 * Removed duplicated match body --- helix-term/src/ui/editor.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index fc8b6470..318180d7 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -774,15 +774,15 @@ impl EditorView { } fn command_mode(&mut self, mode: Mode, cxt: &mut commands::Context, event: KeyEvent) { - match event { + match (event, cxt.editor.count) { // count handling - key!(i @ '0'..='9') => { + (key!(i @ '0'), Some(_)) | (key!(i @ '1'..='9'), _) => { 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)); } // special handling for repeat operator - key!('.') if self.keymaps.pending().is_empty() => { + (key!('.'), _) if self.keymaps.pending().is_empty() => { // first execute whatever put us into insert mode self.last_insert.0.execute(cxt); // then replay the inputs