X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/24c7594d62d8d7fbbcdb64b11ce4adc5d8e6991a..4efcafab7f0aa454f9ebe767133654bc9f44e12c:/atom/packages/vim-mode/spec/vim-state-spec.coffee diff --git a/atom/packages/vim-mode/spec/vim-state-spec.coffee b/atom/packages/vim-mode/spec/vim-state-spec.coffee index 741c371..8fd3fb0 100644 --- a/atom/packages/vim-mode/spec/vim-state-spec.coffee +++ b/atom/packages/vim-mode/spec/vim-state-spec.coffee @@ -14,20 +14,20 @@ describe "VimState", -> editorElement = element editor = editorElement.getModel() vimState = editorElement.vimState - vimState.activateCommandMode() - vimState.resetCommandMode() + vimState.activateNormalMode() + vimState.resetNormalMode() keydown = (key, options={}) -> options.element ?= editorElement helpers.keydown(key, options) - commandModeInputKeydown = (key, opts = {}) -> - editor.commandModeInputView.editorElement.getModel().setText(key) + normalModeInputKeydown = (key, opts = {}) -> + editor.normalModeInputView.editorElement.getModel().setText(key) describe "initialization", -> - it "puts the editor in command-mode initially by default", -> + it "puts the editor in normal-mode initially by default", -> expect(editorElement.classList.contains('vim-mode')).toBe(true) - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(editorElement.classList.contains('normal-mode')).toBe(true) it "puts the editor in insert-mode if startInInsertMode is true", -> atom.config.set 'vim-mode.startInInsertMode', true @@ -41,15 +41,15 @@ describe "VimState", -> expect(editorElement.component.isInputEnabled()).toBeTruthy() it "removes the mode classes from the editor", -> - expect(editorElement.classList.contains("command-mode")).toBeTruthy() + expect(editorElement.classList.contains("normal-mode")).toBeTruthy() vimState.destroy() - expect(editorElement.classList.contains("command-mode")).toBeFalsy() + expect(editorElement.classList.contains("normal-mode")).toBeFalsy() it "is a noop when the editor is already destroyed", -> editorElement.getModel().destroy() vimState.destroy() - describe "command-mode", -> + describe "normal-mode", -> describe "when entering an insertable character", -> beforeEach -> keydown('\\') @@ -86,12 +86,18 @@ describe "VimState", -> expect(editor.getCursors().length).toBe 1 describe "the v keybinding", -> - beforeEach -> keydown('v') + beforeEach -> + editor.setText("012345\nabcdef") + editor.setCursorScreenPosition([0, 0]) + keydown('v') it "puts the editor into visual characterwise mode", -> expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'characterwise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) + + it "selects the current character", -> + expect(editor.getLastSelection().getText()).toEqual '0' describe "the V keybinding", -> beforeEach -> @@ -102,33 +108,34 @@ describe "VimState", -> it "puts the editor into visual linewise mode", -> expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'linewise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) it "selects the current line", -> 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('command-mode')).toBe(false) + 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 'command' - editor.setSelectedBufferRanges([[[0, 0], [0, 3]]]) - - advanceClock(100) + expect(vimState.mode).toEqual 'normal' + 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]]]) @@ -136,27 +143,41 @@ describe "VimState", -> 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') it "puts the editor into insert mode", -> expect(editorElement.classList.contains('insert-mode')).toBe(true) - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) - describe "with content", -> - beforeEach -> editor.setText("012345\n\nabcdef") + describe "the R keybinding", -> + beforeEach -> keydown('R', shift: true) - # FIXME: See atom/vim-mode#2 - xdescribe "on a line with content", -> - beforeEach -> editor.setCursorScreenPosition([0, 6]) + it "puts the editor into replace mode", -> + expect(editorElement.classList.contains('insert-mode')).toBe(true) + expect(editorElement.classList.contains('replace-mode')).toBe(true) + expect(editorElement.classList.contains('normal-mode')).toBe(false) - it "does not allow the cursor to be placed on the \n character", -> + describe "with content", -> + beforeEach -> + editor.setText("012345\n\nabcdef") + editor.setCursorScreenPosition([0, 0]) + + describe "on a line with content", -> + 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', -> @@ -165,9 +186,9 @@ describe "VimState", -> it 'properly clears the opStack', -> keydown('d') keydown('r') - expect(vimState.mode).toBe 'command' + expect(vimState.mode).toBe 'normal' expect(vimState.opStack.length).toBe 0 - atom.commands.dispatch(editor.commandModeInputView.editorElement, "core:cancel") + atom.commands.dispatch(editor.normalModeInputView.editorElement, "core:cancel") keydown('d') expect(editor.getText()).toBe '012345\nabcdef' @@ -193,25 +214,78 @@ 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", -> + expect(editor.getCursorScreenPosition()).toEqual [0, 6] + + it "puts the editor into normal mode when is pressed", -> + keydown('escape') + + expect(editorElement.classList.contains('normal-mode')).toBe(true) + expect(editorElement.classList.contains('insert-mode')).toBe(false) + expect(editorElement.classList.contains('visual-mode')).toBe(false) + + it "puts the editor into normal mode when is pressed", -> + helpers.mockPlatform(editorElement, 'platform-darwin') + keydown('c', ctrl: true) + helpers.unmockPlatform(editorElement) + + expect(editorElement.classList.contains('normal-mode')).toBe(true) + expect(editorElement.classList.contains('insert-mode')).toBe(false) + expect(editorElement.classList.contains('visual-mode')).toBe(false) + + describe "replace-mode", -> + describe "with content", -> + beforeEach -> editor.setText("012345\n\nabcdef") + + describe "when cursor is in the middle of the line", -> + beforeEach -> + editor.setCursorScreenPosition([0, 3]) + keydown('R', shift: true) + + it "moves the cursor to the left when exiting replace mode", -> + keydown('escape') + expect(editor.getCursorScreenPosition()).toEqual [0, 2] + + describe "when cursor is at the beginning of line", -> + beforeEach -> + editor.setCursorScreenPosition([1, 0]) + keydown('R', shift: true) + + it "leaves the cursor at the beginning of line", -> + keydown('escape') + expect(editor.getCursorScreenPosition()).toEqual [1, 0] + + describe "on a line with content", -> + beforeEach -> + keydown('R', shift: true) + 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 command mode when is pressed", -> + it "puts the editor into normal mode when is pressed", -> + keydown('R', shift: true) keydown('escape') - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(editorElement.classList.contains('normal-mode')).toBe(true) expect(editorElement.classList.contains('insert-mode')).toBe(false) + expect(editorElement.classList.contains('replace-mode')).toBe(false) expect(editorElement.classList.contains('visual-mode')).toBe(false) - it "puts the editor into command mode when is pressed", -> + it "puts the editor into normal mode when is pressed", -> + keydown('R', shift: true) helpers.mockPlatform(editorElement, 'platform-darwin') keydown('c', ctrl: true) helpers.unmockPlatform(editorElement) - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(editorElement.classList.contains('normal-mode')).toBe(true) expect(editorElement.classList.contains('insert-mode')).toBe(false) + expect(editorElement.classList.contains('replace-mode')).toBe(false) expect(editorElement.classList.contains('visual-mode')).toBe(false) describe "visual-mode", -> @@ -224,21 +298,21 @@ describe "VimState", -> expect(editor.getSelectedBufferRanges()).toEqual [[[0, 4], [0, 5]]] expect(editor.getSelectedText()).toBe("t") - it "puts the editor into command mode when is pressed", -> + it "puts the editor into normal mode when is pressed", -> keydown('escape') expect(editor.getCursorBufferPositions()).toEqual [[0, 4]] - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(editorElement.classList.contains('normal-mode')).toBe(true) expect(editorElement.classList.contains('visual-mode')).toBe(false) - it "puts the editor into command mode when is pressed on selection is reversed", -> + it "puts the editor into normal mode when is pressed on selection is reversed", -> expect(editor.getSelectedText()).toBe("t") keydown("h") keydown("h") expect(editor.getSelectedText()).toBe("e t") expect(editor.getLastSelection().isReversed()).toBe(true) keydown('escape') - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(editorElement.classList.contains('normal-mode')).toBe(true) expect(editor.getCursorBufferPositions()).toEqual [[0, 2]] describe "motions", -> @@ -253,7 +327,6 @@ describe "VimState", -> keydown("l") expect(editor.getSelectedText()).toBe("t") - keydown("l") keydown("l") expect(editor.getSelectedText()).toBe("tw") @@ -267,7 +340,7 @@ describe "VimState", -> it "operate on the current selection", -> expect(editor.getText()).toEqual "\nabcdef" - describe "returning to command-mode", -> + describe "returning to normal-mode", -> beforeEach -> editor.setText("012345\n\nabcdef") editor.selectLinesContainingCursors() @@ -302,39 +375,65 @@ describe "VimState", -> [0, 8] ]) + it "harmonizes selection directions", -> + keydown("e") + editor.addCursorAtBufferPosition([0, Infinity]) + keydown("h") + keydown("h") + + expect(editor.getSelectedBufferRanges()).toEqual([ + [[0, 4], [0, 5]], + [[0, 11], [0, 13]] + ]) + expect(editor.getCursorBufferPositions()).toEqual([ + [0, 5] + [0, 11] + ]) + + keydown("o") + + expect(editor.getSelectedBufferRanges()).toEqual([ + [[0, 4], [0, 5]], + [[0, 11], [0, 13]] + ]) + expect(editor.getCursorBufferPositions()).toEqual([ + [0, 5] + [0, 13] + ]) + describe "activate visualmode witin visualmode", -> beforeEach -> keydown('escape') - expect(vimState.mode).toEqual 'command' - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(vimState.mode).toEqual 'normal' + expect(editorElement.classList.contains('normal-mode')).toBe(true) - it "activateVisualMode with same type puts the editor into command mode", -> + it "activateVisualMode with same type puts the editor into normal mode", -> keydown('v') expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'characterwise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) keydown('v') - expect(vimState.mode).toEqual 'command' - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(vimState.mode).toEqual 'normal' + expect(editorElement.classList.contains('normal-mode')).toBe(true) keydown('V', shift: true) expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'linewise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) keydown('V', shift: true) - expect(vimState.mode).toEqual 'command' - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(vimState.mode).toEqual 'normal' + expect(editorElement.classList.contains('normal-mode')).toBe(true) keydown('v', ctrl: true) expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'blockwise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) keydown('v', ctrl: true) - expect(vimState.mode).toEqual 'command' - expect(editorElement.classList.contains('command-mode')).toBe(true) + expect(vimState.mode).toEqual 'normal' + expect(editorElement.classList.contains('normal-mode')).toBe(true) describe "change submode within visualmode", -> beforeEach -> @@ -346,22 +445,22 @@ describe "VimState", -> keydown('v') expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'characterwise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) keydown('V', shift: true) expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'linewise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) keydown('v', ctrl: true) expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'blockwise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) keydown('v') expect(editorElement.classList.contains('visual-mode')).toBe(true) expect(vimState.submode).toEqual 'characterwise' - expect(editorElement.classList.contains('command-mode')).toBe(false) + expect(editorElement.classList.contains('normal-mode')).toBe(false) it "recover original range when shift from linewse to characterwise", -> @@ -389,32 +488,32 @@ describe "VimState", -> it "basic marking functionality", -> editor.setCursorScreenPosition([1, 1]) keydown('m') - commandModeInputKeydown('t') + normalModeInputKeydown('t') expect(editor.getText()).toEqual "text in line 1\ntext in line 2\ntext in line 3" editor.setCursorScreenPosition([2, 2]) keydown('`') - commandModeInputKeydown('t') + normalModeInputKeydown('t') expect(editor.getCursorScreenPosition()).toEqual [1, 1] it "real (tracking) marking functionality", -> editor.setCursorScreenPosition([2, 2]) keydown('m') - commandModeInputKeydown('q') + normalModeInputKeydown('q') editor.setCursorScreenPosition([1, 2]) keydown('o') keydown('escape') keydown('`') - commandModeInputKeydown('q') + normalModeInputKeydown('q') expect(editor.getCursorScreenPosition()).toEqual [3, 2] it "real (tracking) marking functionality", -> editor.setCursorScreenPosition([2, 2]) keydown('m') - commandModeInputKeydown('q') + normalModeInputKeydown('q') editor.setCursorScreenPosition([1, 2]) keydown('d') keydown('d') keydown('escape') keydown('`') - commandModeInputKeydown('q') + normalModeInputKeydown('q') expect(editor.getCursorScreenPosition()).toEqual [1, 2]