cancel operator-pending on unrecognized key strokes

Author: jacekkopecky

lib/vim-state.coffee

@@ -36,6 +36,12 @@ class VimState
         @activateVisualMode('characterwise') if @mode is 'command'
     , 100)
 
+    @subscriptions.add atom.keymaps.onDidFailToMatchBinding (e) =>
+      return unless e.keyboardEventTarget is @editorElement
+      if @mode is 'operator-pending'
+        atom.keymaps.cancelPendingState()
+        @resetCommandMode()
+
     @editorElement.classList.add("vim-mode")
     @setupCommandMode()
     if settings.startInInsertMode()

spec/vim-state-spec.coffee

@@ -418,3 +418,25 @@ describe "VimState", ->
       keydown('`')
       commandModeInputKeydown('q')
       expect(editor.getCursorScreenPosition()).toEqual [1, 2]
+
+  describe "unknown key bindings", ->
+    beforeEach ->
+      editor.setText "line one\n line two\n"
+      editor.setCursorBufferPosition [0, 0]
+
+    it "cancels short pending operations on unrecognized keybinding", ->
+      keydown 'c'
+      keydown 'q' #cq doesn't work, should cancel
+      keydown 'w'
+      expect(editor.getCursorBufferPosition()).toEqual [0, 5]
+      expect(editor.getText()).toBe "line one\n line two\n"
+      expect(vimState.mode).toEqual 'command'
+
+    it "cancels long pending operations on unrecognized keybinding", ->
+      keydown 'c'
+      keydown 'i'
+      keydown '3' #i3 is unrecognized, should cancel the whole `ci3` sequence
+      keydown 'w'
+      expect(editor.getCursorBufferPosition()).toEqual [0, 5]
+      expect(editor.getText()).toBe "line one\n line two\n"
+      expect(vimState.mode).toEqual 'command'