Merge pull request #827 from jacekkopecky/fix-806-b

Fix 806 regression

Author: Max Brunsfeld

lib/vim-state.coffee

@@ -31,16 +31,11 @@ class VimState
     @marks = {}
     @subscriptions.add @editor.onDidDestroy => @destroy()
 
-    @subscriptions.add @editor.onDidChangeSelectionRange _.debounce(=>
-      return unless @editor?
-      if @editor.getSelections().every((selection) -> selection.isEmpty())
-        @activateNormalMode() if @mode is 'visual'
-      else
-        @activateVisualMode('characterwise') if @mode is 'normal'
-    , 100)
-
-    @subscriptions.add @editor.onDidChangeCursorPosition ({cursor}) => @ensureCursorIsWithinLine(cursor)
-    @subscriptions.add @editor.onDidAddCursor @ensureCursorIsWithinLine
+    @editorElement.addEventListener 'mouseup', @checkSelections
+    if atom.commands.onDidDispatch?
+      @subscriptions.add atom.commands.onDidDispatch (e) =>
+        if e.target is @editorElement
+          @checkSelections()
 
     @editorElement.classList.add("vim-mode")
     @setupNormalMode()
@@ -52,15 +47,16 @@ class VimState
   destroy: ->
     unless @destroyed
       @destroyed = true
-      @emitter.emit 'did-destroy'
       @subscriptions.dispose()
       if @editor.isAlive()
         @deactivateInsertMode()
         @editorElement.component?.setInputEnabled(true)
         @editorElement.classList.remove("vim-mode")
         @editorElement.classList.remove("normal-mode")
+      @editorElement.removeEventListener 'mouseup', @checkSelections
       @editor = null
       @editorElement = null
+      @emitter.emit 'did-destroy'
 
   # Private: Creates the plugin's bindings
   #
@@ -215,33 +211,28 @@ class VimState
   # it.
   pushOperations: (operations) ->
     return unless operations?
-    try
-      @processing = true
-      operations = [operations] unless _.isArray(operations)
-
-      for operation in operations
-        # Motions in visual mode perform their selections.
-        if @mode is 'visual' and (operation instanceof Motions.Motion or operation instanceof TextObjects.TextObject)
-          operation.execute = operation.select
-
-        # if we have started an operation that responds to canComposeWith check if it can compose
-        # with the operation we're going to push onto the stack
-        if (topOp = @topOperation())? and topOp.canComposeWith? and not topOp.canComposeWith(operation)
-          @resetNormalMode()
-          @emitter.emit('failed-to-compose')
-          break
+    operations = [operations] unless _.isArray(operations)
 
-        @opStack.push(operation)
+    for operation in operations
+      # Motions in visual mode perform their selections.
+      if @mode is 'visual' and (operation instanceof Motions.Motion or operation instanceof TextObjects.TextObject)
+        operation.execute = operation.select
 
-        # If we've received an operator in visual mode, mark the current
-        # selection as the motion to operate on.
-        if @mode is 'visual' and operation instanceof Operators.Operator
-          @opStack.push(new Motions.CurrentSelection(@editor, this))
+      # if we have started an operation that responds to canComposeWith check if it can compose
+      # with the operation we're going to push onto the stack
+      if (topOp = @topOperation())? and topOp.canComposeWith? and not topOp.canComposeWith(operation)
+        @resetNormalMode()
+        @emitter.emit('failed-to-compose')
+        break
 
-        @processOpStack()
-    finally
-      @processing = false
-      @ensureCursorIsWithinLine(cursor) for cursor in @editor.getCursors()
+      @opStack.push(operation)
+
+      # If we've received an operator in visual mode, mark the current
+      # selection as the motion to operate on.
+      if @mode is 'visual' and operation instanceof Operators.Operator
+        @opStack.push(new Motions.CurrentSelection(@editor, this))
+
+      @processOpStack()
 
   onDidFailToCompose: (fn) ->
     @emitter.on('failed-to-compose', fn)
@@ -406,9 +397,7 @@ class VimState
 
     @clearOpStack()
     selection.clear(autoscroll: false) for selection in @editor.getSelections()
-    for cursor in @editor.getCursors()
-      if cursor.isAtEndOfLine() and not cursor.isAtBeginningOfLine()
-        cursor.moveLeft()
+    @ensureCursorsWithinLine()
 
     @updateStatusBar()
 
@@ -661,15 +650,24 @@ class VimState
     text = @getRegister(name)?.text
     @editor.insertText(text) if text?
 
-  ensureCursorIsWithinLine: (cursor) =>
-    return if @processing or @mode isnt 'normal'
+  # Private: ensure the mode follows the state of selections
+  checkSelections: =>
+    return unless @editor?
+    if @editor.getSelections().every((selection) -> selection.isEmpty())
+      @ensureCursorsWithinLine() if @mode is 'normal'
+      @activateNormalMode() if @mode is 'visual'
+    else
+      @activateVisualMode('characterwise') if @mode is 'normal'
+
+  # Private: ensure the cursor stays within the line as appropriate
+  ensureCursorsWithinLine: =>
+    for cursor in @editor.getCursors()
+      {goalColumn} = cursor
+      if cursor.isAtEndOfLine() and not cursor.isAtBeginningOfLine()
+        cursor.moveLeft()
+      cursor.goalColumn = goalColumn
 
-    {goalColumn} = cursor
-    if cursor.isAtEndOfLine() and not cursor.isAtBeginningOfLine()
-      @processing = true # to ignore the cursor change (and recursion) caused by the next line
-      cursor.moveLeft()
-      @processing = false
-    cursor.goalColumn = goalColumn
+    @editor.mergeCursors()
 
 # This uses private APIs and may break if TextBuffer is refactored.
 # Package authors - copy and paste this code at your own risk.

spec/motions-spec.coffee

@@ -452,10 +452,10 @@ describe "Motions", ->
 
     describe "as a selection", ->
       it "selects to the beginning of the whole word", ->
-        editor.setCursorScreenPosition([1, 10])
+        editor.setCursorScreenPosition([1, 9])
         keydown('y')
         keydown('B', shift: true)
-        expect(vimState.getRegister('"').text).toBe 'xyz-12' # because cursor is on the `3`
+        expect(vimState.getRegister('"').text).toBe 'xyz-12'
 
       it "doesn't go past the beginning of the file", ->
         editor.setCursorScreenPosition([0, 0])

spec/vim-state-spec.coffee

@@ -114,34 +114,39 @@ describe "VimState", ->
         expect(editor.getLastSelection().getText()).toEqual '012345\n'
 
     describe "the ctrl-v keybinding", ->
-      beforeEach -> keydown('v', ctrl: true)
+      beforeEach ->
+        editor.setText("012345\nabcdef")
+        editor.setCursorScreenPosition([0, 0])
+        keydown('v', ctrl: true)
 
-      it "puts the editor into visual characterwise mode", ->
+      it "puts the editor into visual blockwise mode", ->
         expect(editorElement.classList.contains('visual-mode')).toBe(true)
         expect(vimState.submode).toEqual 'blockwise'
         expect(editorElement.classList.contains('normal-mode')).toBe(false)
 
     describe "selecting text", ->
       beforeEach ->
-        spyOn(_._, "now").andCallFake -> window.now
         editor.setText("abc def")
+        editor.setCursorScreenPosition([0, 0])
 
       it "puts the editor into visual mode", ->
         expect(vimState.mode).toEqual 'normal'
-        editor.setSelectedBufferRanges([[[0, 0], [0, 3]]])
-
-        advanceClock(100)
+        atom.commands.dispatch(editorElement, "core:select-right")
 
         expect(vimState.mode).toEqual 'visual'
         expect(vimState.submode).toEqual 'characterwise'
-        expect(editor.getSelectedBufferRanges()).toEqual([[[0, 0], [0, 3]]])
+        expect(editor.getSelectedBufferRanges()).toEqual([[[0, 0], [0, 1]]])
 
       it "handles the editor being destroyed shortly after selecting text", ->
         editor.setSelectedBufferRanges([[[0, 0], [0, 3]]])
         editor.destroy()
         vimState.destroy()
         advanceClock(100)
 
+      it "handles native selection such as core:select-all", ->
+        atom.commands.dispatch(editorElement, "core:select-all")
+        expect(editor.getSelectedBufferRanges()).toEqual([[[0, 0], [0, 7]]])
+
     describe "the i keybinding", ->
       beforeEach -> keydown('i')
 
@@ -158,18 +163,21 @@ describe "VimState", ->
         expect(editorElement.classList.contains('normal-mode')).toBe(false)
 
     describe "with content", ->
-      beforeEach -> editor.setText("012345\n\nabcdef")
+      beforeEach ->
+        editor.setText("012345\n\nabcdef")
+        editor.setCursorScreenPosition([0, 0])
 
       describe "on a line with content", ->
-        beforeEach -> editor.setCursorScreenPosition([0, 6])
-
-        it "does not allow the cursor to be placed on the \n character", ->
+        it "does not allow atom commands to place the cursor on the \\n character", ->
+          atom.commands.dispatch(editorElement, "editor:move-to-end-of-line")
           expect(editor.getCursorScreenPosition()).toEqual [0, 5]
 
       describe "on an empty line", ->
-        beforeEach -> editor.setCursorScreenPosition([1, 0])
+        beforeEach ->
+          editor.setCursorScreenPosition([1, 0])
+          atom.commands.dispatch(editorElement, "editor:move-to-end-of-line")
 
-        it "allows the cursor to be placed on the \n character", ->
+        it "allows the cursor to be placed on the \\n character", ->
           expect(editor.getCursorScreenPosition()).toEqual [1, 0]
 
     describe 'with character-input operations', ->
@@ -206,9 +214,11 @@ describe "VimState", ->
           expect(editor.getCursorScreenPosition()).toEqual [1, 0]
 
       describe "on a line with content", ->
-        beforeEach -> editor.setCursorScreenPosition([0, 6])
+        beforeEach ->
+          editor.setCursorScreenPosition([0, 0])
+          atom.commands.dispatch(editorElement, "editor:move-to-end-of-line")
 
-        it "allows the cursor to be placed on the \n character", ->
+        it "allows the cursor to be placed on the \\n character", ->
           expect(editor.getCursorScreenPosition()).toEqual [0, 6]
 
     it "puts the editor into normal mode when <escape> is pressed", ->
@@ -252,9 +262,10 @@ describe "VimState", ->
       describe "on a line with content", ->
         beforeEach ->
           keydown('R', shift: true)
-          editor.setCursorScreenPosition([0, 6])
+          editor.setCursorScreenPosition([0, 0])
+          atom.commands.dispatch(editorElement, "editor:move-to-end-of-line")
 
-        it "allows the cursor to be placed on the \n character", ->
+        it "allows the cursor to be placed on the \\n character", ->
           expect(editor.getCursorScreenPosition()).toEqual [0, 6]
 
     it "puts the editor into normal mode when <escape> is pressed", ->
@@ -365,15 +376,13 @@ describe "VimState", ->
         ])
 
       it "harmonizes selection directions", ->
-        editor.setCursorBufferPosition([0, 0])
-        keydown("e")
         keydown("e")
         editor.addCursorAtBufferPosition([0, Infinity])
         keydown("h")
         keydown("h")
 
         expect(editor.getSelectedBufferRanges()).toEqual([
-          [[0, 0], [0, 5]],
+          [[0, 4], [0, 5]],
           [[0, 11], [0, 13]]
         ])
         expect(editor.getCursorBufferPositions()).toEqual([
@@ -384,7 +393,7 @@ describe "VimState", ->
         keydown("o")
 
         expect(editor.getSelectedBufferRanges()).toEqual([
-          [[0, 0], [0, 5]],
+          [[0, 4], [0, 5]],
           [[0, 11], [0, 13]]
         ])
         expect(editor.getCursorBufferPositions()).toEqual([