insert with count

Repeated insert such as `3i` and `3a` now works.
Also, `.` with a count (such as `3.`) now changes the old prefix:
* for example `2dd3.` will delete 2 and then 3 lines, a subsequent `.`
will again delete 3 lines;
* similarly `dl3.` will delete a character and then 3 more, a
subsequent `.` will again delete 3 characters.

Author: jacekkopecky

lib/operators/general-operators.coffee

@@ -1,6 +1,7 @@
 _ = require 'underscore-plus'
 {Point, Range} = require 'atom'
 {ViewModel} = require '../view-models/view-model'
+Prefixes = require '../prefixes'
 Utils = require '../utils'
 settings = require '../settings'
 
@@ -228,11 +229,24 @@ class Repeat extends Operator
 
   isRecordable: -> false
 
-  execute: (count=1) ->
+  execute: (count) ->
+    return unless (cmd = @vimState.history[0])?
+
     @editor.transact =>
-      _.times count, =>
-        cmd = @vimState.history[0]
-        cmd?.execute()
+
+      if count?
+        # try to propagate prefix to inner operation
+        if cmd instanceof Prefixes.Repeat
+          cmd.count = count
+        else if cmd.motion instanceof Prefixes.Repeat
+          cmd.motion.count = count
+        else
+          repeat = new Prefixes.Repeat(count)
+          repeat.compose(cmd)
+          cmd = @vimState.history[0] = repeat
+
+      cmd.execute()
+
 #
 # It creates a mark at the current cursor position
 #

lib/operators/input.coffee

@@ -8,17 +8,22 @@ settings = require '../settings'
 # tells the operation to repeat itself instead of enter insert mode.
 class Insert extends Operator
   standalone: true
+  count: 1
 
   isComplete: -> @standalone or super
 
-  confirmTransaction: (transaction) ->
+  confirmTransaction: (transaction, interrupted) ->
     bundler = new TransactionBundler(transaction)
     @typedText = bundler.buildInsertText()
+    if @count > 1 and not interrupted
+      @editor.insertText(@typedText) for i in [2..@count]
 
-  execute: ->
+  execute: (count) ->
+    @count = count if count?
     if @typingCompleted
       return unless @typedText? and @typedText.length > 0
-      @editor.insertText(@typedText, normalizeLineEndings: true)
+      @editor.transact =>
+        @editor.insertText(@typedText, normalizeLineEndings: true) for i in [1..@count]
       for cursor in @editor.getCursors()
         cursor.moveLeft() unless cursor.isAtBeginningOfLine()
     else
@@ -111,7 +116,7 @@ class Change extends Insert
       else
         @editor.delete()
 
-    return super if @typingCompleted
+    return super(1) if @typingCompleted
 
     @vimState.activateInsertMode()
     @typingCompleted = true
@@ -132,7 +137,7 @@ class Substitute extends Insert
 
     if @typingCompleted
       @typedText = @typedText.trimLeft()
-      return super
+      return super(1)
 
     @vimState.activateInsertMode()
     @typingCompleted = true
@@ -157,7 +162,7 @@ class SubstituteLine extends Insert
 
     if @typingCompleted
       @typedText = @typedText.trimLeft()
-      return super
+      return super(1)
 
     @vimState.activateInsertMode()
     @typingCompleted = true

lib/vim-state.coffee

@@ -402,11 +402,12 @@ class VimState
     return unless @mode in [null, 'insert']
     @editorElement.component.setInputEnabled(false)
     @editor.groupChangesSinceCheckpoint(@insertionCheckpoint)
-    @insertionCheckpoint = null
     transaction = _.last(@editor.buffer.history.undoStack)
     item = @inputOperator(@history[0])
     if item? and transaction?
       item.confirmTransaction(transaction)
+      @editor.groupChangesSinceCheckpoint(@insertionCheckpoint)
+    @insertionCheckpoint = null
     for cursor in @editor.getCursors()
       cursor.moveLeft() unless cursor.isAtBeginningOfLine()
 
@@ -417,7 +418,7 @@ class VimState
     transaction = _.last(@editor.buffer.history.undoStack)
     item = @inputOperator(@history[0])
     if item? and transaction?
-      item.confirmTransaction(transaction)
+      item.confirmTransaction(transaction, interrupted: true)
     @setInsertionCheckpoint()
 
 

spec/operators-spec.coffee

@@ -120,6 +120,20 @@ describe "Operators", ->
       keydown('.')
       expect(editor.getText()).toBe 'abab'
 
+    it "is repeatable with a new count", ->
+      keydown('3')
+      keydown('s')
+      editor.insertText("ab")
+      keydown('escape')
+      expect(editor.getText()).toBe '0ab45'
+      keydown('1')
+      keydown('.')
+      expect(editor.getText()).toBe '0aab45'
+      editor.setCursorScreenPosition([0, 0])
+      keydown('3')
+      keydown('.')
+      expect(editor.getText()).toBe 'abb45'
+
     it "is undoable", ->
       editor.setCursorScreenPosition([0, 0])
       keydown('3')
@@ -1231,14 +1245,33 @@ describe "Operators", ->
 
       expect(editor.getText()).toBe ""
 
-    it "composes with motions", ->
+    it "composes with prefix", ->
       keydown 'd'
       keydown 'd'
       keydown '2'
       keydown '.'
 
       expect(editor.getText()).toBe "78"
 
+    it "changes previous prefix", ->
+      keydown '2'
+      keydown 'd'
+      keydown 'd'
+      keydown '1'
+      keydown '.'
+
+      expect(editor.getText()).toBe "78"
+
+    it "adds prefix if none was there", ->
+      keydown 'd'
+      keydown 'd'
+      keydown 'u'
+      keydown '2'
+      keydown '.'
+      keydown '.'
+
+      expect(editor.getText()).toBe ""
+
   describe "the r keybinding", ->
     beforeEach ->
       editor.setText("12\n34\n\n")
@@ -1410,6 +1443,29 @@ describe "Operators", ->
       keydown 'u'
       expect(editor.getText()).toBe "123\n4567"
 
+    it "allows count prefix", ->
+      keydown '3'
+      keydown 'i'
+      editor.insertText("abc")
+      keydown 'escape'
+      expect(editor.getText()).toBe "abcabcabc123\nabcabcabc4567"
+
+      keydown 'u'
+      expect(editor.getText()).toBe "123\n4567"
+
+      keydown '.'
+      keydown '.'
+      expect(editor.getText()).toBe "abcabcababcabcabcc123\nabcabcababcabcabcc4567"
+
+      keydown 'u'
+      expect(editor.getText()).toBe "abcabcabc123\nabcabcabc4567"
+
+      editor.setText('123\n4567')
+      editor.setCursorBufferPosition([0, 0])
+      keydown '2'
+      keydown '.'
+      expect(editor.getText()).toBe "abcabc123\n4567"
+
     it "allows repeating typing", ->
       keydown 'i'
       editor.insertText("abcXX")
@@ -1424,7 +1480,21 @@ describe "Operators", ->
       keydown '.'
       expect(editor.getText()).toBe "abababccc123\nabababccc4567"
 
+    it "gets prefix from .", ->
+      keydown 'i'
+      editor.insertText("abc")
+      keydown 'escape'
+      expect(editor.getText()).toBe "abc123\nabc4567"
+
+      keydown '2'
+      keydown '.'
+      expect(editor.getText()).toBe "ababcabcc123\nababcabcc4567"
+
+      keydown '.'
+      expect(editor.getText()).toBe "ababcababcabccc123\nababcababcabccc4567"
+
     it "stores for repeating only the last batch of characters", ->
+      keydown '2'
       keydown 'i'
       editor.insertText("abc")
       atom.commands.dispatch editorElement, 'vim-mode:move-left-insert'
@@ -1458,6 +1528,21 @@ describe "Operators", ->
       expect(editor.getText()).toBe "abcabc"
       expect(editor.getCursorScreenPosition()).toEqual [0, 5]
 
+    it "combines with a prefix", ->
+      keydown '2'
+      keydown 'a'
+      editor.insertText("abc")
+      keydown 'escape'
+      expect(editor.getText()).toBe "abcabc"
+      expect(editor.getCursorScreenPosition()).toEqual [0, 5]
+      keydown '.'
+      expect(editor.getText()).toBe "abcabcabcabc"
+      expect(editor.getCursorScreenPosition()).toEqual [0, 11]
+      keydown '1'
+      keydown '.'
+      expect(editor.getText()).toBe "abcabcabcabcabc"
+      expect(editor.getCursorScreenPosition()).toEqual [0, 14]
+
     it "stores for repeating only the last batch of characters, repeats as insert", ->
       keydown 'a'
       editor.insertText("abc")