diff --git a/spec/app/edit-session-spec.coffee b/spec/app/edit-session-spec.coffee index d9c513599..b35b01b2b 100644 --- a/spec/app/edit-session-spec.coffee +++ b/spec/app/edit-session-spec.coffee @@ -313,30 +313,30 @@ describe "EditSession", -> editSession.moveCursorToBeginningOfWord() expect(editSession.getCursorBufferPosition()).toEqual [9, 2] - describe ".moveCursorToPreviousWordBoundry()", -> - it "moves the cursor to the previous word boundry", -> + describe ".moveCursorToPreviousWordBoundary()", -> + it "moves the cursor to the previous word boundary", -> editSession.setCursorBufferPosition [0, 8] editSession.addCursorAtBufferPosition [2, 0] editSession.addCursorAtBufferPosition [2, 4] editSession.addCursorAtBufferPosition [3, 14] [cursor1, cursor2, cursor3, cursor4] = editSession.getCursors() - editSession.moveCursorToPreviousWordBoundry() + editSession.moveCursorToPreviousWordBoundary() expect(cursor1.getBufferPosition()).toEqual [0, 4] expect(cursor2.getBufferPosition()).toEqual [1, 30] expect(cursor3.getBufferPosition()).toEqual [2, 0] expect(cursor4.getBufferPosition()).toEqual [3, 13] - describe ".moveCursorToNextWordBoundry()", -> - it "moves the cursor to the previous word boundry", -> + describe ".moveCursorToNextWordBoundary()", -> + it "moves the cursor to the previous word boundary", -> editSession.setCursorBufferPosition [0, 8] editSession.addCursorAtBufferPosition [2, 40] editSession.addCursorAtBufferPosition [3, 0] editSession.addCursorAtBufferPosition [3, 30] [cursor1, cursor2, cursor3, cursor4] = editSession.getCursors() - editSession.moveCursorToNextWordBoundry() + editSession.moveCursorToNextWordBoundary() expect(cursor1.getBufferPosition()).toEqual [0, 13] expect(cursor2.getBufferPosition()).toEqual [3, 0] @@ -698,14 +698,14 @@ describe "EditSession", -> expect(selection2.getBufferRange()).toEqual [[3,48], [3,51]] expect(selection2.isReversed()).toBeFalsy() - describe ".selectToPreviousWordBoundry()", -> - it "select to the previous word boundry", -> + describe ".selectToPreviousWordBoundary()", -> + it "select to the previous word boundary", -> editSession.setCursorBufferPosition [0, 8] editSession.addCursorAtBufferPosition [2, 0] editSession.addCursorAtBufferPosition [3, 4] editSession.addCursorAtBufferPosition [3, 14] - editSession.selectToPreviousWordBoundry() + editSession.selectToPreviousWordBoundary() expect(editSession.getSelections().length).toBe 4 [selection1, selection2, selection3, selection4] = editSession.getSelections() @@ -718,14 +718,14 @@ describe "EditSession", -> expect(selection4.getBufferRange()).toEqual [[3,14], [3,13]] expect(selection4.isReversed()).toBeTruthy() - describe ".selectToNextWordBoundry()", -> - it "select to the next word boundry", -> + describe ".selectToNextWordBoundary()", -> + it "select to the next word boundary", -> editSession.setCursorBufferPosition [0, 8] editSession.addCursorAtBufferPosition [2, 40] editSession.addCursorAtBufferPosition [4, 0] editSession.addCursorAtBufferPosition [3, 30] - editSession.selectToNextWordBoundry() + editSession.selectToNextWordBoundary() expect(editSession.getSelections().length).toBe 4 [selection1, selection2, selection3, selection4] = editSession.getSelections() diff --git a/src/app/cursor.coffee b/src/app/cursor.coffee index 1af6770dc..7a2b9fde8 100644 --- a/src/app/cursor.coffee +++ b/src/app/cursor.coffee @@ -244,14 +244,14 @@ class Cursor if position = @getBeginningOfNextWordBufferPosition() @setBufferPosition(position) - # Moves the cursor to the previous word boundry. - moveToPreviousWordBoundry: -> - if position = @getMovePreviousWordBoundryBufferPosition() + # Moves the cursor to the previous word boundary. + moveToPreviousWordBoundary: -> + if position = @getMovePreviousWordBoundaryBufferPosition() @setBufferPosition(position) - # Moves the cursor to the next word boundry. - moveToNextWordBoundry: -> - if position = @getMoveNextWordBoundryBufferPosition() + # Moves the cursor to the next word boundary. + moveToNextWordBoundary: -> + if position = @getMoveNextWordBoundaryBufferPosition() @setBufferPosition(position) # Retrieves the buffer position of where the current word starts. @@ -277,7 +277,7 @@ class Cursor # Retrieves buffer position of previous word boiundry. It might be on the # current word, or the previous word. - getMovePreviousWordBoundryBufferPosition: (options = {}) -> + getMovePreviousWordBoundaryBufferPosition: (options = {}) -> currentBufferPosition = @getBufferPosition() previousNonBlankRow = @editSession.buffer.previousNonBlankRow(currentBufferPosition.row) scanRange = [[previousNonBlankRow, 0], currentBufferPosition] @@ -299,7 +299,7 @@ class Cursor # Retrieves buffer position of previous word boiundry. It might be on the # current word, or the previous word. - getMoveNextWordBoundryBufferPosition: (options = {}) -> + getMoveNextWordBoundaryBufferPosition: (options = {}) -> currentBufferPosition = @getBufferPosition() scanRange = [currentBufferPosition, @editSession.getEofBufferPosition()] diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee index 48bb6dd7d..453553eb3 100644 --- a/src/app/edit-session.coffee +++ b/src/app/edit-session.coffee @@ -1101,11 +1101,11 @@ class EditSession moveCursorToBeginningOfNextWord: -> @moveCursors (cursor) -> cursor.moveToBeginningOfNextWord() - moveCursorToPreviousWordBoundry: -> - @moveCursors (cursor) -> cursor.moveToPreviousWordBoundry() + moveCursorToPreviousWordBoundary: -> + @moveCursors (cursor) -> cursor.moveToPreviousWordBoundary() - moveCursorToNextWordBoundry: -> - @moveCursors (cursor) -> cursor.moveToNextWordBoundry() + moveCursorToNextWordBoundary: -> + @moveCursors (cursor) -> cursor.moveToNextWordBoundary() # Internal: moveCursors: (fn) -> @@ -1156,11 +1156,11 @@ class EditSession selectToEndOfLine: -> @expandSelectionsForward (selection) => selection.selectToEndOfLine() - selectToPreviousWordBoundry: -> - @expandSelectionsBackward (selection) => selection.selectToPreviousWordBoundry() + selectToPreviousWordBoundary: -> + @expandSelectionsBackward (selection) => selection.selectToPreviousWordBoundary() - selectToNextWordBoundry: -> - @expandSelectionsForward (selection) => selection.selectToNextWordBoundry() + selectToNextWordBoundary: -> + @expandSelectionsForward (selection) => selection.selectToNextWordBoundary() # Selects the current line. selectLine: -> diff --git a/src/app/editor.coffee b/src/app/editor.coffee index 70e0c9d49..24a617d65 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -141,8 +141,8 @@ class Editor extends View 'editor:move-to-beginning-of-word': @moveCursorToBeginningOfWord 'editor:move-to-end-of-word': @moveCursorToEndOfWord 'editor:move-to-beginning-of-next-word': @moveCursorToBeginningOfNextWord - 'editor:move-to-previous-word-boundry': @moveCursorToPreviousWordBoundry - 'editor:move-to-next-word-boundry': @moveCursorToNextWordBoundry + 'editor:move-to-previous-word-boundary': @moveCursorToPreviousWordBoundary + 'editor:move-to-next-word-boundary': @moveCursorToNextWordBoundary 'editor:select-to-end-of-line': @selectToEndOfLine 'editor:select-to-beginning-of-line': @selectToBeginningOfLine 'editor:select-to-end-of-word': @selectToEndOfWord @@ -239,11 +239,11 @@ class Editor extends View # {Delegates to: EditSession.moveCursorToFirstCharacterOfLine} moveCursorToFirstCharacterOfLine: -> @activeEditSession.moveCursorToFirstCharacterOfLine() - # {Delegates to: EditSession.moveCursorToPreviousWordBoundry} - moveCursorToPreviousWordBoundry: -> @activeEditSession.moveCursorToPreviousWordBoundry() + # {Delegates to: EditSession.moveCursorToPreviousWordBoundary} + moveCursorToPreviousWordBoundary: -> @activeEditSession.moveCursorToPreviousWordBoundary() - # {Delegates to: EditSession.moveCursorToNextWordBoundry} - moveCursorToNextWordBoundry: -> @activeEditSession.moveCursorToNextWordBoundry() + # {Delegates to: EditSession.moveCursorToNextWordBoundary} + moveCursorToNextWordBoundary: -> @activeEditSession.moveCursorToNextWordBoundary() # {Delegates to: EditSession.moveCursorToEndOfLine} moveCursorToEndOfLine: -> @activeEditSession.moveCursorToEndOfLine() diff --git a/src/app/selection.coffee b/src/app/selection.coffee index 7764708b4..f2ef1fb66 100644 --- a/src/app/selection.coffee +++ b/src/app/selection.coffee @@ -214,13 +214,13 @@ class Selection selectToBeginningOfNextWord: -> @modifySelection => @cursor.moveToBeginningOfNextWord() - # Selects text to the previous word boundry. - selectToPreviousWordBoundry: -> - @modifySelection => @cursor.moveToPreviousWordBoundry() + # Selects text to the previous word boundary. + selectToPreviousWordBoundary: -> + @modifySelection => @cursor.moveToPreviousWordBoundary() - # Selects text to the next word boundry. - selectToNextWordBoundry: -> - @modifySelection => @cursor.moveToNextWordBoundry() + # Selects text to the next word boundary. + selectToNextWordBoundary: -> + @modifySelection => @cursor.moveToNextWordBoundary() # Moves the selection down one row. addSelectionBelow: ->