diff options
| author | Ben Beltran <ben@nsovocal.com> | 2015-09-28 12:39:59 -0500 |
|---|---|---|
| committer | Ben Beltran <ben@nsovocal.com> | 2015-09-28 12:39:59 -0500 |
| commit | 455f099b504ec07dd492ab31987ae05a6f6774c7 (patch) | |
| tree | 22b0c7fd8e492733b97e661750a2d79c46da451d /atom/packages/vim-mode-visual-block | |
| parent | 24c7594d62d8d7fbbcdb64b11ce4adc5d8e6991a (diff) | |
Adds atom packages
Diffstat (limited to 'atom/packages/vim-mode-visual-block')
5 files changed, 38 insertions, 30 deletions
diff --git a/atom/packages/vim-mode-visual-block/CHANGELOG.md b/atom/packages/vim-mode-visual-block/CHANGELOG.md index f89e8de..6b70a5d 100644 --- a/atom/packages/vim-mode-visual-block/CHANGELOG.md +++ b/atom/packages/vim-mode-visual-block/CHANGELOG.md @@ -1,3 +1,22 @@ +## 0.2.13 - Revert +- Completely remove `activationCommands`. + +## 0.2.12 - Improve +- Now activated by `vim-mode:activate-blockwise-visual-mode`. +- Delete deprecated keymap notification. + +## 0.2.11 - Quick FIX for #3 +- Disable activationCommands to avoid `getEditorState` throw error because of `@vimModeService` is undefined. + +## 0.2.10 + +## 0.2.9 - Follow renaming to NormalMode +- Use `activateNormalMode` instead of `activateCommandMode`. + +## 0.2.8 - Improve +* Refactoring. +* `activationCommands`. + ## 0.2.7 - Improve * `ctrl-v` within visual-block now work same as escape. #1 diff --git a/atom/packages/vim-mode-visual-block/README.md b/atom/packages/vim-mode-visual-block/README.md index 1be6782..7918470 100644 --- a/atom/packages/vim-mode-visual-block/README.md +++ b/atom/packages/vim-mode-visual-block/README.md @@ -17,7 +17,8 @@ For older version user * Remove explicit keymap from `keymap.cson` and use default keymap. # Limitation -- Currently yank and paste for block range is not suppoted. +- Count not supported. +- Currently yank and paste for block range is not supported. - No support for non-contiguous multi selection. # Todo diff --git a/atom/packages/vim-mode-visual-block/lib/main.coffee b/atom/packages/vim-mode-visual-block/lib/main.coffee index 61cfe76..dc5a5c2 100644 --- a/atom/packages/vim-mode-visual-block/lib/main.coffee +++ b/atom/packages/vim-mode-visual-block/lib/main.coffee @@ -14,15 +14,14 @@ module.exports = activate: (state) -> @disposables = new CompositeDisposable blockwiseCommands = {} - # [TODO] remove 'h', 'l' after some period. - commands = 'jkhloDCIA'.split('') + commands = 'jkoDCIA'.split('') commands.push 'escape', 'ctrl-v' for command in commands do (command) => name = "#{@prefix}:#{command}" blockwiseCommands[name] = (event) => @blockOperation(event, command) - blockwiseCommands["#{@prefix}:toggle-debug"] = => @toggleDebug() + # blockwiseCommands["#{@prefix}:toggle-debug"] = => @toggleDebug() @disposables.add atom.commands.add('atom-text-editor', blockwiseCommands) @reset() @@ -63,21 +62,20 @@ module.exports = currentRow = editor.getLastCursor()?.getBufferRow() @startRow ?= currentRow - # @debug "@startRow = #{@startRow}" switch command when 'o' @startRow = currentRow when 'D', 'C' - vimState.activateCommandMode() + vimState.activateNormalMode() event.abortKeyBinding() when 'escape', 'ctrl-v' - vimState.activateCommandMode() + vimState.activateNormalMode() editor.clearSelections() when 'j', 'k' - cursorPositions = editor.getCursorsOrderedByBufferPosition() - cursorTop = _.first cursorPositions - cursorBottom = _.last cursorPositions + cursors = editor.getCursorsOrderedByBufferPosition() + cursorTop = _.first cursors + cursorBottom = _.last cursors if (command is 'j' and cursorTop.getBufferRow() >= @startRow) or (command is 'k' and cursorBottom.getBufferRow() <= @startRow) @@ -125,22 +123,12 @@ module.exports = cursor.setBufferPosition(pointTarget) adjustCursor(selection) for selection in editor.getSelections() - vimState.activateCommandMode() + vimState.activateNormalMode() vimState.activateInsertMode() if command is 'A' and cursorsAdjusted.length cursor.moveRight() for cursor in cursorsAdjusted - else - event.abortKeyBinding() - content = """ - *#{@prefix}* - * From version 0.2.5, `#{@prefix}` provide default keymap. - * And `h`, `l` command become obsolete. - * Remove all explicit keymap from `keymap.cson`. - """ - atom.notifications.addWarning content, dismissable: true - unless @isVisualBlockMode vimState @reset() diff --git a/atom/packages/vim-mode-visual-block/node_modules/underscore-plus/package.json b/atom/packages/vim-mode-visual-block/node_modules/underscore-plus/package.json index 1650d7d..067af6f 100644 --- a/atom/packages/vim-mode-visual-block/node_modules/underscore-plus/package.json +++ b/atom/packages/vim-mode-visual-block/node_modules/underscore-plus/package.json @@ -15,7 +15,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/atom/underscore-plus.git" + "url": "git+https://github.com/atom/underscore-plus.git" }, "bugs": { "url": "https://github.com/atom/underscore-plus/issues" diff --git a/atom/packages/vim-mode-visual-block/package.json b/atom/packages/vim-mode-visual-block/package.json index d0fe933..b874d41 100644 --- a/atom/packages/vim-mode-visual-block/package.json +++ b/atom/packages/vim-mode-visual-block/package.json @@ -1,11 +1,11 @@ { "name": "vim-mode-visual-block", "main": "./lib/main", - "version": "0.2.7", + "version": "0.2.13", "description": "Add visual-blockwise feature to vim-mode", "repository": { "type": "git", - "url": "https://github.com/t9md/atom-vim-mode-visual-block" + "url": "git+https://github.com/t9md/atom-vim-mode-visual-block.git" }, "license": "MIT", "engines": { @@ -21,16 +21,16 @@ "dependencies": { "underscore-plus": "^1.6.6" }, - "readme": "# vim-mode-visual-block\n\nAdd visual-block operation to [vim-mode](https://atom.io/packages/vim-mode).\n\n\n\n# What's this?\n\n**Temporarily** workaround, until vim-mode support visual block mode natively.\nI'm not intended to complete solution.\n\n# Keymap\n\nFrom version 0.2.5, starting to provide [default keymap](https://github.com/t9md/atom-vim-mode-visual-block/blob/master/keymaps/vim-mode-visual-block.cson). \n\nFor older version user\n* Remove explicit keymap from `keymap.cson` and use default keymap.\n\n# Limitation\n- Currently yank and paste for block range is not suppoted.\n- No support for non-contiguous multi selection.\n\n# Todo\n* [x] Precise state check when escape from visual-block.\n* [x] Support other insert-mode initiator like `a`, `i`, `C`.\n* [ ] Yank and paste support.\n* [ ] Concatenate undo transaction?.\n", + "readme": "# vim-mode-visual-block\n\nAdd visual-block operation to [vim-mode](https://atom.io/packages/vim-mode).\n\n\n\n# What's this?\n\n**Temporarily** workaround, until vim-mode support visual block mode natively.\nI'm not intended to complete solution.\n\n# Keymap\n\nFrom version 0.2.5, starting to provide [default keymap](https://github.com/t9md/atom-vim-mode-visual-block/blob/master/keymaps/vim-mode-visual-block.cson). \n\nFor older version user\n* Remove explicit keymap from `keymap.cson` and use default keymap.\n\n# Limitation\n- Count not supported.\n- Currently yank and paste for block range is not supported.\n- No support for non-contiguous multi selection.\n\n# Todo\n* [x] Precise state check when escape from visual-block.\n* [x] Support other insert-mode initiator like `a`, `i`, `C`.\n* [ ] Yank and paste support.\n* [ ] Concatenate undo transaction?.\n", "readmeFilename": "README.md", "bugs": { "url": "https://github.com/t9md/atom-vim-mode-visual-block/issues" }, - "homepage": "https://github.com/t9md/atom-vim-mode-visual-block", - "_id": "vim-mode-visual-block@0.2.7", - "_shasum": "13e1098ad2d14b834a6708c602295b05399147f4", - "_resolved": "file:../d-11562-87855-1gkfksx/package.tgz", - "_from": "../d-11562-87855-1gkfksx/package.tgz", + "homepage": "https://github.com/t9md/atom-vim-mode-visual-block#readme", + "_id": "vim-mode-visual-block@0.2.13", + "_shasum": "5f4d8288c01082f685c4dc4bb039241e61d624e6", + "_resolved": "file:../d-115828-94488-fbcgjf/package.tgz", + "_from": "../d-115828-94488-fbcgjf/package.tgz", "_atomModuleCache": { "version": 1, "dependencies": [ |