fixing undo problem

Author: jacekkopecky

lib/operators/input.coffee

@@ -12,7 +12,7 @@ class Insert extends Operator
 
   isComplete: -> @standalone or super
 
-  confirmChanges: (changes, interrupted) ->
+  confirmChanges: (changes, insertionCheckpoint, {interrupted}={}) ->
     bundler = new TransactionBundler(changes)
     @typedText = bundler.buildInsertText()
     if @count > 1 and not interrupted

lib/vim-state.coffee

@@ -409,23 +409,23 @@ class VimState
   deactivateInsertMode: ->
     return unless @mode in [null, 'insert']
     @editorElement.component.setInputEnabled(false)
-    @editor.groupChangesSinceCheckpoint(@insertionCheckpoint)
     changes = getChangesSinceCheckpoint(@editor.buffer, @insertionCheckpoint)
     item = @inputOperator(@history[0])
-    @insertionCheckpoint = null
     if item?
-      item.confirmChanges(changes)
+      item.confirmChanges(changes, @insertionCheckpoint)
+    @editor.groupChangesSinceCheckpoint(@insertionCheckpoint)
+    @insertionCheckpoint = null
     for cursor in @editor.getCursors()
       cursor.moveLeft() unless cursor.isAtBeginningOfLine()
 
   interruptInsertMode: ->
     return unless @mode is 'insert'
-    @editor.groupChangesSinceCheckpoint(@insertionCheckpoint)
     changes = getChangesSinceCheckpoint(@editor.buffer, @insertionCheckpoint)
     item = @inputOperator(@history[0])
-    @insertionCheckpoint = null
     if item?
-      item.confirmChanges(changes, interrupted: true)
+      item.confirmChanges(changes, @insertionCheckpoint, interrupted: true)
+    @editor.groupChangesSinceCheckpoint(@insertionCheckpoint)
+    @insertionCheckpoint = null
     @setInsertionCheckpoint()
 
 

spec/operators-spec.coffee

@@ -1408,6 +1408,7 @@ describe "Operators", ->
       keydown 'd'
       keydown 'd'
       keydown 'u'
+      editor.setCursorScreenPosition([0, 0])
       keydown '2'
       keydown '.'
       keydown '.'