Merge pull request #234 from runforprogram/master

[VIM-1991] fix >0 number register not work
JetBrains · Apr 17, 2020 · 4ec0bac · 4ec0bac
2 parents 613c234 + 962cfb7
commit 4ec0bac
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/com/maddyhome/idea/vim/KeyHandler.java b/src/com/maddyhome/idea/vim/KeyHandler.java
@@ -563,7 +563,9 @@ private boolean handleAbandonedMappingSequence(@NotNull Editor editor,
   private boolean isCommandCountKey(char chKey, @NotNull CommandState editorState) {
     // Make sure to avoid handling '0' as the start of a count.
     final CommandBuilder commandBuilder = editorState.getCommandBuilder();
-    return (editorState.getMode() == CommandState.Mode.COMMAND || editorState.getMode() == CommandState.Mode.VISUAL)
+    return ((editorState.getMode() == CommandState.Mode.COMMAND
+             &&editorState.getSubMode()!=CommandState.SubMode.REGISTER_PENDING) 
+            || editorState.getMode() == CommandState.Mode.VISUAL)
       && commandBuilder.isExpectingCount() && Character.isDigit(chKey) && (commandBuilder.getCount() > 0 || chKey != '0');
   }