Merge pull request #480 from github/vim-core-changes

Vim core changes

spec/app/edit-session-spec.coffee

@@ -341,6 +341,35 @@ describe "EditSession", ->
         editSession.moveCursorToEndOfWord()
         expect(editSession.getCursorBufferPosition()).toEqual [11, 8]
 
+    describe ".moveCursorToBeginningOfNextWord()", ->
+      it "moves the cursor before the first character of the next word", ->
+        editSession.setCursorBufferPosition [0,6]
+        editSession.addCursorAtBufferPosition [1,11]
+        editSession.addCursorAtBufferPosition [2,0]
+        [cursor1, cursor2, cursor3] = editSession.getCursors()
+
+        editSession.moveCursorToBeginningOfNextWord()
+
+        expect(cursor1.getBufferPosition()).toEqual [0, 14]
+        expect(cursor2.getBufferPosition()).toEqual [1, 13]
+        expect(cursor3.getBufferPosition()).toEqual [2, 4]
+
+      it "does not blow up when there is no next word", ->
+        editSession.setCursorBufferPosition [Infinity, Infinity]
+        endPosition = editSession.getCursorBufferPosition()
+        editSession.moveCursorToBeginningOfNextWord()
+        expect(editSession.getCursorBufferPosition()).toEqual endPosition
+
+      it "treats lines with only whitespace as a word", ->
+        editSession.setCursorBufferPosition([9, 4])
+        editSession.moveCursorToBeginningOfNextWord()
+        expect(editSession.getCursorBufferPosition()).toEqual [10, 0]
+
+      it "works when the current line is blank", ->
+        editSession.setCursorBufferPosition([10, 0])
+        editSession.moveCursorToBeginningOfNextWord()
+        expect(editSession.getCursorBufferPosition()).toEqual [11, 9]
+
     describe ".getCurrentParagraphBufferRange()", ->
       it "returns the buffer range of the current paragraph, delimited by blank lines or the beginning / end of the file", ->
         buffer.setText """
@@ -619,6 +648,25 @@ describe "EditSession", ->
         expect(selection2.getBufferRange()).toEqual [[3,48], [3,50]]
         expect(selection2.isReversed()).toBeFalsy()
 
+    describe ".selectToBeginningOfNextWord()", ->
+      it "selects text from cusor position to beginning of next word", ->
+        editSession.setCursorScreenPosition [0,4]
+        editSession.addCursorAtScreenPosition [3,48]
+
+        editSession.selectToBeginningOfNextWord()
+
+        expect(editSession.getCursors().length).toBe 2
+        [cursor1, cursor2] = editSession.getCursors()
+        expect(cursor1.getBufferPosition()).toEqual [0,14]
+        expect(cursor2.getBufferPosition()).toEqual [3,51]
+
+        expect(editSession.getSelections().length).toBe 2
+        [selection1, selection2] = editSession.getSelections()
+        expect(selection1.getBufferRange()).toEqual [[0,4], [0,14]]
+        expect(selection1.isReversed()).toBeFalsy()
+        expect(selection2.getBufferRange()).toEqual [[3,48], [3,51]]
+        expect(selection2.isReversed()).toBeFalsy()
+
     describe ".selectWord()", ->
       describe "when the cursor is inside a word", ->
         it "selects the entire word", ->

src/app/cursor.coffee

@@ -165,6 +165,10 @@ class Cursor
     if position = @getEndOfCurrentWordBufferPosition()
       @setBufferPosition(position)
 
+  moveToBeginningOfNextWord: ->
+    if position = @getBeginningOfNextWordBufferPosition()
+      @setBufferPosition(position)
+
   getBeginningOfCurrentWordBufferPosition: (options = {}) ->
     allowPrevious = options.allowPrevious ? true
     currentBufferPosition = @getBufferPosition()
@@ -194,6 +198,18 @@ class Cursor
 
     endOfWordPosition or currentBufferPosition
 
+  getBeginningOfNextWordBufferPosition: (options = {}) ->
+    currentBufferPosition = @getBufferPosition()
+    start = if @isSurroundedByWhitespace() then currentBufferPosition else @getEndOfCurrentWordBufferPosition()
+    scanRange = [start, @editSession.getEofBufferPosition()]
+
+    beginningOfNextWordPosition = null
+    @editSession.scanInBufferRange (options.wordRegex ? @wordRegExp()), scanRange, ({range, stop}) =>
+      beginningOfNextWordPosition = range.start
+      stop()
+
+    beginningOfNextWordPosition or currentBufferPosition
+
   getCurrentWordBufferRange: (options={}) ->
     startOptions = _.extend(_.clone(options), allowPrevious: false)
     endOptions = _.extend(_.clone(options), allowNext: false)

src/app/edit-session.coffee

@@ -729,6 +729,9 @@ class EditSession
   moveCursorToEndOfWord: ->
     @moveCursors (cursor) -> cursor.moveToEndOfWord()
 
+  moveCursorToBeginningOfNextWord: ->
+    @moveCursors (cursor) -> cursor.moveToBeginningOfNextWord()
+
   moveCursors: (fn) ->
     fn(cursor) for cursor in @getCursors()
     @mergeCursors()
@@ -803,6 +806,9 @@ class EditSession
   selectToEndOfWord: ->
     @expandSelectionsForward (selection) => selection.selectToEndOfWord()
 
+  selectToBeginningOfNextWord: ->
+    @expandSelectionsForward (selection) => selection.selectToBeginningOfNextWord()
+
   selectWord: ->
     @expandSelectionsForward (selection) => selection.selectWord()
 

src/app/editor.coffee

@@ -119,10 +119,12 @@ class Editor extends View
       'editor:move-to-first-character-of-line': @moveCursorToFirstCharacterOfLine
       'editor:move-to-beginning-of-word': @moveCursorToBeginningOfWord
       'editor:move-to-end-of-word': @moveCursorToEndOfWord
+      'editor:move-to-beginning-of-next-word': @moveCursorToBeginningOfNextWord
       'editor:select-to-end-of-line': @selectToEndOfLine
       'editor:select-to-beginning-of-line': @selectToBeginningOfLine
       'editor:select-to-end-of-word': @selectToEndOfWord
       'editor:select-to-beginning-of-word': @selectToBeginningOfWord
+      'editor:select-to-beginning-of-next-word': @selectToBeginningOfNextWord
       'editor:add-selection-below': @addSelectionBelow
       'editor:add-selection-above': @addSelectionAbove
       'editor:select-line': @selectLine
@@ -178,6 +180,7 @@ class Editor extends View
   moveCursorRight: -> @activeEditSession.moveCursorRight()
   moveCursorToBeginningOfWord: -> @activeEditSession.moveCursorToBeginningOfWord()
   moveCursorToEndOfWord: -> @activeEditSession.moveCursorToEndOfWord()
+  moveCursorToBeginningOfNextWord: -> @activeEditSession.moveCursorToBeginningOfNextWord()
   moveCursorToTop: -> @activeEditSession.moveCursorToTop()
   moveCursorToBottom: -> @activeEditSession.moveCursorToBottom()
   moveCursorToBeginningOfLine: -> @activeEditSession.moveCursorToBeginningOfLine()
@@ -218,6 +221,7 @@ class Editor extends View
   addSelectionAbove: -> @activeEditSession.addSelectionAbove()
   selectToBeginningOfWord: -> @activeEditSession.selectToBeginningOfWord()
   selectToEndOfWord: -> @activeEditSession.selectToEndOfWord()
+  selectToBeginningOfNextWord: -> @activeEditSession.selectToBeginningOfNextWord()
   selectWord: -> @activeEditSession.selectWord()
   selectLine: -> @activeEditSession.selectLine()
   selectToScreenPosition: (position) -> @activeEditSession.selectToScreenPosition(position)

src/app/selection.coffee

@@ -152,6 +152,9 @@ class Selection
   selectToEndOfWord: ->
     @modifySelection => @cursor.moveToEndOfWord()
 
+  selectToBeginningOfNextWord: ->
+    @modifySelection => @cursor.moveToBeginningOfNextWord()
+
   addSelectionBelow: ->
     range = (@goalBufferRange ? @getBufferRange()).copy()
     nextRow = range.end.row + 1

src/packages/autocomplete/lib/autocomplete-view.coffee

@@ -27,6 +27,8 @@ class AutocompleteView extends SelectList
   handleEvents: ->
     @editor.on 'editor:path-changed', => @setCurrentBuffer(@editor.getBuffer())
     @editor.command 'autocomplete:attach', => @attach()
+    @editor.command 'autocomplete:next', => @selectNextItem()
+    @editor.command 'autocomplete:previous', => @selectPreviousItem()
 
     @miniEditor.preempt 'textInput', (e) =>
       text = e.originalEvent.data