Compare commits
71 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30ad82671b | ||
|
|
59cafd6b99 | ||
|
|
ef4bb8a6ac | ||
|
|
744ec7351e | ||
|
|
23dde8c7ee | ||
|
|
a887128b9f | ||
|
|
a33959f829 | ||
|
|
b9b3ba3e9f | ||
|
|
15038d7b0c | ||
|
|
2b7e6346a5 | ||
|
|
4f1ebf8a1a | ||
|
|
653d62ec15 | ||
|
|
93d0af041f | ||
|
|
146d832e14 | ||
|
|
14f0c83261 | ||
|
|
c75395174f | ||
|
|
d0059a7bb2 | ||
|
|
1a515fcb05 | ||
|
|
964813a0b0 | ||
|
|
2fa4584eb4 | ||
|
|
23be6cc862 | ||
|
|
195396b47e | ||
|
|
791c62a3ba | ||
|
|
d76940dabc | ||
|
|
4312777508 | ||
|
|
15296ff369 | ||
|
|
117d7439ad | ||
|
|
8590f5a678 | ||
|
|
3283b72394 | ||
|
|
91f748f85f | ||
|
|
5301f4a5d4 | ||
|
|
daddcf8d0f | ||
|
|
9f1a767fec | ||
|
|
afaf152432 | ||
|
|
26ac7c50b1 | ||
|
|
b5cb054b39 | ||
|
|
4747bcf5e8 | ||
|
|
eb7a23717a | ||
|
|
f2ee5516e0 | ||
|
|
3dbcf76ff7 | ||
|
|
d0e7afe164 | ||
|
|
78a479bf9b | ||
|
|
dfbbdadfbc | ||
|
|
516b722f38 | ||
|
|
abb5cd207f | ||
|
|
545f13294e | ||
|
|
9b62ba70ca | ||
|
|
def663b9cc | ||
|
|
546aa9f95c | ||
|
|
99dd953370 | ||
|
|
708aa94eb0 | ||
|
|
02ab74465c | ||
|
|
ed3417c842 | ||
|
|
daaf8b3a2d | ||
|
|
378cf6cff4 | ||
|
|
0abb61fcb8 | ||
|
|
50f1beb1e9 | ||
|
|
f4eb1aef7d | ||
|
|
28b451f33d | ||
|
|
cf3e250ea0 | ||
|
|
26781dc9a4 | ||
|
|
ccf6aa22f8 | ||
|
|
e2c42a6eeb | ||
|
|
ba01f8a1b1 | ||
|
|
cd80a163cb | ||
|
|
d3c3603eb4 | ||
|
|
02d62547c7 | ||
|
|
d5acbd3f53 | ||
|
|
12bb28ceda | ||
|
|
0441b24c21 | ||
|
|
fd0aa7a6c3 |
15 changed files with 343 additions and 55 deletions
9
.editorconfig
Normal file
9
.editorconfig
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
|
||||||
|
[*.{coffee,json}]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
38
.travis.yml
38
.travis.yml
|
|
@ -1,13 +1,45 @@
|
||||||
language: objective-c
|
## Project specific config ###
|
||||||
|
language: generic
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- APM_TEST_PACKAGES="vim-mode"
|
global:
|
||||||
|
- APM_TEST_PACKAGES="vim-mode-plus"
|
||||||
|
- ATOM_LINT_WITH_BUNDLED_NODE="true"
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
- ATOM_CHANNEL=stable
|
||||||
|
- ATOM_CHANNEL=beta
|
||||||
|
|
||||||
|
os:
|
||||||
|
- linux
|
||||||
|
|
||||||
|
dist: trusty
|
||||||
|
|
||||||
|
### Generic setup follows ###
|
||||||
|
script:
|
||||||
|
- curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh
|
||||||
|
- chmod u+x build-package.sh
|
||||||
|
- ./build-package.sh
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
on_success: never
|
on_success: never
|
||||||
on_failure: change
|
on_failure: change
|
||||||
|
|
||||||
script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
|
||||||
git:
|
git:
|
||||||
depth: 10
|
depth: 10
|
||||||
|
|
||||||
|
sudo: false
|
||||||
|
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- build-essential
|
||||||
|
- git
|
||||||
|
- libgnome-keyring-dev
|
||||||
|
- libsecret-1-dev
|
||||||
|
- fakeroot
|
||||||
|
|
|
||||||
33
CHANGELOG.md
33
CHANGELOG.md
|
|
@ -1,3 +1,36 @@
|
||||||
|
## (unpublished)
|
||||||
|
|
||||||
|
* Fix `:enew` not working ([#215](https://github.com/lloeki/ex-mode/pull/215))
|
||||||
|
|
||||||
|
## 0.18.0
|
||||||
|
|
||||||
|
* Add Gdefault support ([#191](https://github.com/lloeki/ex-mode/pull/191))
|
||||||
|
* Add :sort command ([#190](https://github.com/lloeki/ex-mode/pull/190))
|
||||||
|
|
||||||
|
## 0.17.0
|
||||||
|
|
||||||
|
* Add support for Atom 1.19 ([#185](https://github.com/lloeki/ex-mode/pull/185))
|
||||||
|
* Added support for canceling ex-mode with Ctrl-C ([#186](https://github.com/lloeki/ex-mode/pull/186))
|
||||||
|
|
||||||
|
## 0.16.0
|
||||||
|
|
||||||
|
* Support for Atom 1.18 and 1.19 ([#184](https://github.com/lloeki/ex-mode/pull/184))
|
||||||
|
|
||||||
|
## 0.15.0
|
||||||
|
* `vim-mode-plus` support!
|
||||||
|
- Add keybinding (@jmarianer)
|
||||||
|
- Support `:substitute` command (@mkiken)
|
||||||
|
- Support marks
|
||||||
|
- Use `vim-mode-plus` in specs
|
||||||
|
|
||||||
|
## 0.14.0
|
||||||
|
* Support `:tabonly` (@jmarianer)
|
||||||
|
* Fix `:x` closing Atom instead of the current pane
|
||||||
|
|
||||||
|
## 0.13.1
|
||||||
|
* Limit addresses to the last line
|
||||||
|
* Fix autocompleting a non existent directory (@mcnicholls)
|
||||||
|
|
||||||
## 0.13.0
|
## 0.13.0
|
||||||
* Added basic support for visual marks (e.g. `:'<,'>s/foo/bar`)
|
* Added basic support for visual marks (e.g. `:'<,'>s/foo/bar`)
|
||||||
* Added `smartcase` option to `:set`
|
* Added `smartcase` option to `:set`
|
||||||
|
|
|
||||||
33
README.md
Normal file → Executable file
33
README.md
Normal file → Executable file
|
|
@ -4,7 +4,9 @@ ex-mode for Atom's vim-mode
|
||||||
|
|
||||||
## Use
|
## Use
|
||||||
|
|
||||||
Install both [vim-mode](https://github.com/atom/vim-mode) and ex-mode. Type `:` in command mode. Enter `w` or `write`.
|
Install both [vim-mode-plus](https://github.com/t9md/atom-vim-mode-plus) (or
|
||||||
|
the deprecated `vim-mode`) and ex-mode. Type `:` in command mode. Enter `w` or
|
||||||
|
`write`.
|
||||||
|
|
||||||
## Extend
|
## Extend
|
||||||
|
|
||||||
|
|
@ -28,7 +30,34 @@ atom.packages.onDidActivatePackage (pack) ->
|
||||||
Ex.registerAlias 'Wq', 'wq'
|
Ex.registerAlias 'Wq', 'wq'
|
||||||
```
|
```
|
||||||
|
|
||||||
See `lib/ex.coffee` for some examples commands. Contributions are very welcome!
|
## Existing commands
|
||||||
|
|
||||||
|
This is the baseline list of commands supported in `ex-mode`.
|
||||||
|
|
||||||
|
| Command | Operation |
|
||||||
|
| --------------------------------------- | ---------------------------------- |
|
||||||
|
| `q/quit/tabc/tabclose` | Close active tab |
|
||||||
|
| `qall/quitall` | Close all tabs |
|
||||||
|
| `tabe/tabedit/tabnew` | Open new tab |
|
||||||
|
| `e/edit/tabe/tabedit/tabnew <file>` | Edit given file |
|
||||||
|
| `tabn/tabnext` | Go to next tab |
|
||||||
|
| `tabp/tabprevious` | Go to previous tab |
|
||||||
|
| `tabo/tabonly` | Close other tabs |
|
||||||
|
| `w/write` | Save active tab |
|
||||||
|
| `w/write/saveas <file>` | Save as |
|
||||||
|
| `wall/wa` | Save all tabs |
|
||||||
|
| `sp/split` | Split window |
|
||||||
|
| `sp/split <file>` | Open file in split window |
|
||||||
|
| `s/substitute` | Substitute regular expression in active line |
|
||||||
|
| `vsp/vsplit` | Vertical split window |
|
||||||
|
| `vsp/vsplit <file>` | Open file in vertical split window |
|
||||||
|
| `delete` | Cut active line |
|
||||||
|
| `yank` | Copy active line |
|
||||||
|
| `set <options>` | Set options |
|
||||||
|
| `sort` | Sort all lines in file |
|
||||||
|
| `sort <line range>` | Sort lines in line range |
|
||||||
|
|
||||||
|
See `lib/ex.coffee` for the implementations of these commands. Contributions are very welcome!
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,5 +7,10 @@
|
||||||
|
|
||||||
# For more detailed documentation see
|
# For more detailed documentation see
|
||||||
# https://atom.io/docs/latest/advanced/keymaps
|
# https://atom.io/docs/latest/advanced/keymaps
|
||||||
|
'atom-text-editor.vim-mode-plus:not(.insert-mode)':
|
||||||
|
':': 'ex-mode:open'
|
||||||
|
'atom-text-editor.ex-mode-editor':
|
||||||
|
'ctrl-c': 'ex-mode:close'
|
||||||
|
'ctrl-[': 'ex-mode:close'
|
||||||
'atom-text-editor.vim-mode:not(.insert-mode)':
|
'atom-text-editor.vim-mode:not(.insert-mode)':
|
||||||
':': 'ex-mode:open'
|
':': 'ex-mode:open'
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ class AutoComplete
|
||||||
if @completions.length == 0
|
if @completions.length == 0
|
||||||
@completions = completeFunc()
|
@completions = completeFunc()
|
||||||
|
|
||||||
|
complete = ''
|
||||||
if @completions.length
|
if @completions.length
|
||||||
complete = @completions[@autoCompleteIndex % @completions.length]
|
complete = @completions[@autoCompleteIndex % @completions.length]
|
||||||
@autoCompleteIndex++
|
@autoCompleteIndex++
|
||||||
|
|
@ -63,8 +64,10 @@ class AutoComplete
|
||||||
basePath = path.dirname(filePath)
|
basePath = path.dirname(filePath)
|
||||||
baseName = path.basename(filePath)
|
baseName = path.basename(filePath)
|
||||||
|
|
||||||
|
try
|
||||||
|
basePathStat = fs.statSync(basePath)
|
||||||
|
if basePathStat.isDirectory()
|
||||||
files = fs.readdirSync(basePath)
|
files = fs.readdirSync(basePath)
|
||||||
|
|
||||||
return @filterByPrefix(files, baseName).map((f) =>
|
return @filterByPrefix(files, baseName).map((f) =>
|
||||||
filePath = path.join(basePath, f)
|
filePath = path.join(basePath, f)
|
||||||
if fs.lstatSync(filePath).isDirectory()
|
if fs.lstatSync(filePath).isDirectory()
|
||||||
|
|
@ -72,3 +75,6 @@ class AutoComplete
|
||||||
else
|
else
|
||||||
return command + ' ' + filePath
|
return command + ' ' + filePath
|
||||||
)
|
)
|
||||||
|
return []
|
||||||
|
catch err
|
||||||
|
return []
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,11 @@ class Command
|
||||||
addr = row
|
addr = row
|
||||||
else if str is '$'
|
else if str is '$'
|
||||||
# Lines are 0-indexed in Atom, but 1-indexed in vim.
|
# Lines are 0-indexed in Atom, but 1-indexed in vim.
|
||||||
addr = @editor.getBuffer().lines.length - 1
|
# The two ways of getting length let us support Atom 1.19's new buffer
|
||||||
|
# implementation (https://github.com/atom/atom/pull/14435) and still
|
||||||
|
# support 1.18 and below
|
||||||
|
buffer = @editor.getBuffer()
|
||||||
|
addr = (buffer.getLineCount?() ? buffer.lines.length) - 1
|
||||||
else if str[0] in ["+", "-"]
|
else if str[0] in ["+", "-"]
|
||||||
addr = row + @parseOffset(str)
|
addr = row + @parseOffset(str)
|
||||||
else if not isNaN(str)
|
else if not isNaN(str)
|
||||||
|
|
@ -22,7 +26,7 @@ class Command
|
||||||
else if str[0] is "'" # Parse Mark...
|
else if str[0] is "'" # Parse Mark...
|
||||||
unless @vimState?
|
unless @vimState?
|
||||||
throw new CommandError("Couldn't get access to vim-mode.")
|
throw new CommandError("Couldn't get access to vim-mode.")
|
||||||
mark = @vimState.marks[str[1]]
|
mark = @vimState.mark.marks[str[1]]
|
||||||
unless mark?
|
unless mark?
|
||||||
throw new CommandError("Mark #{str} not set.")
|
throw new CommandError("Mark #{str} not set.")
|
||||||
addr = mark.getEndBufferPosition().row
|
addr = mark.getEndBufferPosition().row
|
||||||
|
|
@ -73,7 +77,9 @@ class Command
|
||||||
return
|
return
|
||||||
|
|
||||||
# Step 4: Address parsing
|
# Step 4: Address parsing
|
||||||
lastLine = @editor.getBuffer().lines.length - 1
|
# see comment in parseAddr about line length
|
||||||
|
buffer = @editor.getBuffer()
|
||||||
|
lastLine = (buffer.getLineCount?() ? buffer.lines.length) - 1
|
||||||
if cl[0] is '%'
|
if cl[0] is '%'
|
||||||
range = [0, lastLine]
|
range = [0, lastLine]
|
||||||
cl = cl[1..]
|
cl = cl[1..]
|
||||||
|
|
@ -123,8 +129,9 @@ class Command
|
||||||
address1 += @parseOffset(off1)
|
address1 += @parseOffset(off1)
|
||||||
|
|
||||||
address1 = 0 if address1 is -1
|
address1 = 0 if address1 is -1
|
||||||
|
address1 = lastLine if address1 > lastLine
|
||||||
|
|
||||||
if address1 < 0 or address1 > lastLine
|
if address1 < 0
|
||||||
throw new CommandError('Invalid range')
|
throw new CommandError('Invalid range')
|
||||||
|
|
||||||
if addr2?
|
if addr2?
|
||||||
|
|
@ -132,7 +139,10 @@ class Command
|
||||||
if off2?
|
if off2?
|
||||||
address2 += @parseOffset(off2)
|
address2 += @parseOffset(off2)
|
||||||
|
|
||||||
if address2 < 0 or address2 > lastLine
|
address2 = 0 if address2 is -1
|
||||||
|
address2 = lastLine if address2 > lastLine
|
||||||
|
|
||||||
|
if address2 < 0
|
||||||
throw new CommandError('Invalid range')
|
throw new CommandError('Invalid range')
|
||||||
|
|
||||||
if address2 < address1
|
if address2 < address1
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,9 @@ module.exports = ExMode =
|
||||||
@vim = vim
|
@vim = vim
|
||||||
@globalExState.setVim(vim)
|
@globalExState.setVim(vim)
|
||||||
|
|
||||||
|
consumeVimModePlus: (vim) ->
|
||||||
|
this.consumeVim(vim)
|
||||||
|
|
||||||
config:
|
config:
|
||||||
splitbelow:
|
splitbelow:
|
||||||
title: 'Split below'
|
title: 'Split below'
|
||||||
|
|
@ -47,3 +50,13 @@ module.exports = ExMode =
|
||||||
description: 'when splitting, split from right'
|
description: 'when splitting, split from right'
|
||||||
type: 'boolean'
|
type: 'boolean'
|
||||||
default: 'false'
|
default: 'false'
|
||||||
|
gdefault:
|
||||||
|
title: 'Gdefault'
|
||||||
|
description: 'When on, the ":substitute" flag \'g\' is default on'
|
||||||
|
type: 'boolean'
|
||||||
|
default: 'false'
|
||||||
|
onlyCloseBuffers:
|
||||||
|
title: 'Only close buffers'
|
||||||
|
description: 'When on, quitall only closes all buffers, not entire Atom instance'
|
||||||
|
type: 'boolean'
|
||||||
|
default: 'false'
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,8 @@ class ExCommandModeInputElement extends HTMLDivElement
|
||||||
@editorContainer.style.height = "0px"
|
@editorContainer.style.height = "0px"
|
||||||
|
|
||||||
@editorElement = document.createElement "atom-text-editor"
|
@editorElement = document.createElement "atom-text-editor"
|
||||||
@editorElement.classList.add('editor')
|
@editorElement.classList.add('editor') # Consider this deprecated!
|
||||||
|
@editorElement.classList.add('ex-mode-editor')
|
||||||
@editorElement.getModel().setMini(true)
|
@editorElement.getModel().setMini(true)
|
||||||
@editorElement.setAttribute('mini', '')
|
@editorElement.setAttribute('mini', '')
|
||||||
@editorContainer.appendChild(@editorElement)
|
@editorContainer.appendChild(@editorElement)
|
||||||
|
|
@ -40,6 +41,7 @@ class ExCommandModeInputElement extends HTMLDivElement
|
||||||
|
|
||||||
atom.commands.add(@editorElement, 'core:confirm', @confirm.bind(this))
|
atom.commands.add(@editorElement, 'core:confirm', @confirm.bind(this))
|
||||||
atom.commands.add(@editorElement, 'core:cancel', @cancel.bind(this))
|
atom.commands.add(@editorElement, 'core:cancel', @cancel.bind(this))
|
||||||
|
atom.commands.add(@editorElement, 'ex-mode:close', @cancel.bind(this))
|
||||||
atom.commands.add(@editorElement, 'blur', @cancel.bind(this))
|
atom.commands.add(@editorElement, 'blur', @cancel.bind(this))
|
||||||
|
|
||||||
backspace: ->
|
backspace: ->
|
||||||
|
|
|
||||||
102
lib/ex.coffee
102
lib/ex.coffee
|
|
@ -3,6 +3,7 @@ CommandError = require './command-error'
|
||||||
fs = require 'fs-plus'
|
fs = require 'fs-plus'
|
||||||
VimOption = require './vim-option'
|
VimOption = require './vim-option'
|
||||||
_ = require 'underscore-plus'
|
_ = require 'underscore-plus'
|
||||||
|
atom
|
||||||
|
|
||||||
defer = () ->
|
defer = () ->
|
||||||
deferred = {}
|
deferred = {}
|
||||||
|
|
@ -17,7 +18,12 @@ trySave = (func) ->
|
||||||
deferred = defer()
|
deferred = defer()
|
||||||
|
|
||||||
try
|
try
|
||||||
func()
|
response = func()
|
||||||
|
|
||||||
|
if response instanceof Promise
|
||||||
|
response.then ->
|
||||||
|
deferred.resolve()
|
||||||
|
else
|
||||||
deferred.resolve()
|
deferred.resolve()
|
||||||
catch error
|
catch error
|
||||||
if error.message.endsWith('is a directory')
|
if error.message.endsWith('is a directory')
|
||||||
|
|
@ -127,7 +133,11 @@ class Ex
|
||||||
atom.workspace.getActivePane().destroyActiveItem()
|
atom.workspace.getActivePane().destroyActiveItem()
|
||||||
|
|
||||||
quitall: ->
|
quitall: ->
|
||||||
|
if !atom.config.get('ex-mode.onlyCloseBuffers')
|
||||||
atom.close()
|
atom.close()
|
||||||
|
else
|
||||||
|
atom.workspace.getTextEditors().forEach (editor) ->
|
||||||
|
editor.destroy()
|
||||||
|
|
||||||
q: => @quit()
|
q: => @quit()
|
||||||
|
|
||||||
|
|
@ -163,6 +173,16 @@ class Ex
|
||||||
|
|
||||||
tabp: => @tabprevious()
|
tabp: => @tabprevious()
|
||||||
|
|
||||||
|
tabonly: ->
|
||||||
|
tabBar = atom.workspace.getPanes()[0]
|
||||||
|
tabBarElement = atom.views.getView(tabBar).querySelector(".tab-bar")
|
||||||
|
tabBarElement.querySelector(".right-clicked") && tabBarElement.querySelector(".right-clicked").classList.remove("right-clicked")
|
||||||
|
tabBarElement.querySelector(".active").classList.add("right-clicked")
|
||||||
|
atom.commands.dispatch(tabBarElement, 'tabs:close-other-tabs')
|
||||||
|
tabBarElement.querySelector(".active").classList.remove("right-clicked")
|
||||||
|
|
||||||
|
tabo: => @tabonly()
|
||||||
|
|
||||||
edit: ({ range, args, editor }) ->
|
edit: ({ range, args, editor }) ->
|
||||||
filePath = args.trim()
|
filePath = args.trim()
|
||||||
if filePath[0] is '!'
|
if filePath[0] is '!'
|
||||||
|
|
@ -191,9 +211,7 @@ class Ex
|
||||||
e: (args) => @edit(args)
|
e: (args) => @edit(args)
|
||||||
|
|
||||||
enew: ->
|
enew: ->
|
||||||
buffer = atom.workspace.getActiveTextEditor().buffer
|
atom.workspace.open()
|
||||||
buffer.setPath(undefined)
|
|
||||||
buffer.load()
|
|
||||||
|
|
||||||
write: ({ range, args, editor, saveas }) ->
|
write: ({ range, args, editor, saveas }) ->
|
||||||
saveas ?= false
|
saveas ?= false
|
||||||
|
|
@ -211,29 +229,30 @@ class Ex
|
||||||
deferred = defer()
|
deferred = defer()
|
||||||
|
|
||||||
editor = atom.workspace.getActiveTextEditor()
|
editor = atom.workspace.getActiveTextEditor()
|
||||||
saved = false
|
|
||||||
|
# Case 1; path is provided
|
||||||
if filePath.length isnt 0
|
if filePath.length isnt 0
|
||||||
fullPath = getFullPath(filePath)
|
fullPath = getFullPath filePath
|
||||||
if editor.getPath()? and (not fullPath? or editor.getPath() == fullPath)
|
|
||||||
if saveas
|
# Only write when it does not exist or we have a force flag set.
|
||||||
throw new CommandError("Argument required")
|
if force or not fs.existsSync(fullPath)
|
||||||
else
|
editor.saveAs(fullPath)
|
||||||
# Use editor.save when no path is given or the path to the file is given
|
return deferred.promise
|
||||||
trySave(-> editor.save()).then(deferred.resolve)
|
|
||||||
saved = true
|
|
||||||
else if not fullPath?
|
|
||||||
fullPath = atom.showSaveDialogSync()
|
|
||||||
|
|
||||||
if not saved and fullPath?
|
|
||||||
if not force and fs.existsSync(fullPath)
|
|
||||||
throw new CommandError("File exists (add ! to override)")
|
throw new CommandError("File exists (add ! to override)")
|
||||||
if saveas or editor.getFileName() == null
|
|
||||||
editor = atom.workspace.getActiveTextEditor()
|
|
||||||
trySave(-> editor.saveAs(fullPath, editor)).then(deferred.resolve)
|
|
||||||
else
|
|
||||||
trySave(-> saveAs(fullPath, editor)).then(deferred.resolve)
|
|
||||||
|
|
||||||
deferred.promise
|
# Case 2; no path provided, call editor save.
|
||||||
|
editor = atom.workspace.getActiveTextEditor()
|
||||||
|
|
||||||
|
# Does the current buffer exist?
|
||||||
|
if editor.getPath()? and fs.existsSync(editor.getPath())
|
||||||
|
trySave(-> editor.save()).then(deferred.promise)
|
||||||
|
else
|
||||||
|
# Cant see what the better API is but Pane.saveActiveItemAs() is the only call
|
||||||
|
# I could find that states it will ask the user.
|
||||||
|
trySave(-> atom.workspace.getActivePane().saveActiveItemAs()).then(deferred.promise)
|
||||||
|
|
||||||
|
return deferred.promise
|
||||||
|
|
||||||
wall: ->
|
wall: ->
|
||||||
atom.workspace.saveAll()
|
atom.workspace.saveAll()
|
||||||
|
|
@ -242,7 +261,7 @@ class Ex
|
||||||
@write(args)
|
@write(args)
|
||||||
|
|
||||||
wq: (args) =>
|
wq: (args) =>
|
||||||
@write(args).then => @quit()
|
@write(args).then(=> @quit())
|
||||||
|
|
||||||
wa: =>
|
wa: =>
|
||||||
@wall()
|
@wall()
|
||||||
|
|
@ -266,6 +285,7 @@ class Ex
|
||||||
|
|
||||||
xit: (args) => @wq(args)
|
xit: (args) => @wq(args)
|
||||||
|
|
||||||
|
x: (args) => @xit(args)
|
||||||
|
|
||||||
split: ({ range, args }) ->
|
split: ({ range, args }) ->
|
||||||
args = args.trim()
|
args = args.trim()
|
||||||
|
|
@ -324,16 +344,30 @@ class Ex
|
||||||
|
|
||||||
[pattern, substition, flags] = parsed
|
[pattern, substition, flags] = parsed
|
||||||
if pattern is ''
|
if pattern is ''
|
||||||
|
if vimState.getSearchHistoryItem?
|
||||||
|
# vim-mode
|
||||||
pattern = vimState.getSearchHistoryItem()
|
pattern = vimState.getSearchHistoryItem()
|
||||||
|
else if vimState.searchHistory?
|
||||||
|
# vim-mode-plus
|
||||||
|
pattern = vimState.searchHistory.get('prev')
|
||||||
|
|
||||||
if not pattern?
|
if not pattern?
|
||||||
atom.beep()
|
atom.beep()
|
||||||
throw new CommandError('No previous regular expression')
|
throw new CommandError('No previous regular expression')
|
||||||
else
|
else
|
||||||
|
if vimState.pushSearchHistory?
|
||||||
|
# vim-mode
|
||||||
vimState.pushSearchHistory(pattern)
|
vimState.pushSearchHistory(pattern)
|
||||||
|
else if vimState.searchHistory?
|
||||||
|
# vim-mode-plus
|
||||||
|
vimState.searchHistory.save(pattern)
|
||||||
|
|
||||||
try
|
try
|
||||||
flagsObj = {}
|
flagsObj = {}
|
||||||
flags.split('').forEach((flag) -> flagsObj[flag] = true)
|
flags.split('').forEach((flag) -> flagsObj[flag] = true)
|
||||||
|
# gdefault option
|
||||||
|
if atom.config.get('ex-mode.gdefault')
|
||||||
|
flagsObj.g = !flagsObj.g
|
||||||
patternRE = getSearchTerm(pattern, flagsObj)
|
patternRE = getSearchTerm(pattern, flagsObj)
|
||||||
catch e
|
catch e
|
||||||
if e.message.indexOf('Invalid flags supplied to RegExp constructor') is 0
|
if e.message.indexOf('Invalid flags supplied to RegExp constructor') is 0
|
||||||
|
|
@ -415,4 +449,24 @@ class Ex
|
||||||
throw new CommandError("No such option: #{option}")
|
throw new CommandError("No such option: #{option}")
|
||||||
optionProcessor()
|
optionProcessor()
|
||||||
|
|
||||||
|
sort: ({ range }) =>
|
||||||
|
editor = atom.workspace.getActiveTextEditor()
|
||||||
|
sortingRange = [[]]
|
||||||
|
|
||||||
|
# If no range is provided, the entire file should be sorted.
|
||||||
|
isMultiLine = range[1] - range[0] > 1
|
||||||
|
if isMultiLine
|
||||||
|
sortingRange = [[range[0], 0], [range[1] + 1, 0]]
|
||||||
|
else
|
||||||
|
sortingRange = [[0, 0], [editor.getLastBufferRow(), 0]]
|
||||||
|
|
||||||
|
# Store every bufferedRow string in an array.
|
||||||
|
textLines = []
|
||||||
|
for lineIndex in [sortingRange[0][0]..sortingRange[1][0] - 1]
|
||||||
|
textLines.push(editor.lineTextForBufferRow(lineIndex))
|
||||||
|
|
||||||
|
# Sort the array and join them together with newlines for writing back to the file.
|
||||||
|
sortedText = _.sortBy(textLines).join('\n') + '\n'
|
||||||
|
editor.buffer.setTextInRange(sortingRange, sortedText)
|
||||||
|
|
||||||
module.exports = Ex
|
module.exports = Ex
|
||||||
|
|
|
||||||
|
|
@ -56,4 +56,10 @@ class VimOption
|
||||||
noscs: =>
|
noscs: =>
|
||||||
@nosmartcase()
|
@nosmartcase()
|
||||||
|
|
||||||
|
gdefault: =>
|
||||||
|
atom.config.set("ex-mode.gdefault", true)
|
||||||
|
|
||||||
|
nogdefault: =>
|
||||||
|
atom.config.set("ex-mode.gdefault", false)
|
||||||
|
|
||||||
module.exports = VimOption
|
module.exports = VimOption
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "ex-mode",
|
"name": "ex-mode",
|
||||||
"main": "./lib/ex-mode",
|
"main": "./lib/ex-mode",
|
||||||
"version": "0.13.0",
|
"version": "0.18.0",
|
||||||
"description": "Ex for Atom's vim-mode",
|
"description": "Ex for Atom's vim-mode",
|
||||||
"activationCommands": {
|
"activationCommands": {
|
||||||
"atom-workspace": "ex-mode:open"
|
"atom-workspace": "ex-mode:open"
|
||||||
|
|
@ -23,6 +23,11 @@
|
||||||
"versions": {
|
"versions": {
|
||||||
"^0.1.0": "consumeVim"
|
"^0.1.0": "consumeVim"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"vim-mode-plus": {
|
||||||
|
"versions": {
|
||||||
|
"^0.1.0": "consumeVimModePlus"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"providedServices": {
|
"providedServices": {
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ describe "autocomplete functionality", ->
|
||||||
beforeEach ->
|
beforeEach ->
|
||||||
@autoComplete = new AutoComplete(['taba', 'tabb', 'tabc'])
|
@autoComplete = new AutoComplete(['taba', 'tabb', 'tabc'])
|
||||||
@testDir = path.join(os.tmpdir(), "atom-ex-mode-spec-#{uuid.v4()}")
|
@testDir = path.join(os.tmpdir(), "atom-ex-mode-spec-#{uuid.v4()}")
|
||||||
|
@nonExistentTestDir = path.join(os.tmpdir(), "atom-ex-mode-spec-#{uuid.v4()}")
|
||||||
@testFile1 = path.join(@testDir, "atom-ex-testfile-a.txt")
|
@testFile1 = path.join(@testDir, "atom-ex-testfile-a.txt")
|
||||||
@testFile2 = path.join(@testDir, "atom-ex-testfile-b.txt")
|
@testFile2 = path.join(@testDir, "atom-ex-testfile-b.txt")
|
||||||
|
|
||||||
|
|
@ -80,3 +81,20 @@ describe "autocomplete functionality", ->
|
||||||
|
|
||||||
it "lists files once", ->
|
it "lists files once", ->
|
||||||
expect(@autoComplete.getFilePathCompletion.callCount).toBe(1)
|
expect(@autoComplete.getFilePathCompletion.callCount).toBe(1)
|
||||||
|
|
||||||
|
describe "autocomplete non existent directory", ->
|
||||||
|
beforeEach ->
|
||||||
|
@completed = @autoComplete.getAutocomplete('tabe ' + @nonExistentTestDir)
|
||||||
|
|
||||||
|
it "returns no completions", ->
|
||||||
|
expected = '';
|
||||||
|
expect(@completed).toEqual(expected)
|
||||||
|
|
||||||
|
describe "autocomplete existing file as directory", ->
|
||||||
|
beforeEach ->
|
||||||
|
filePath = @testFile1 + path.sep
|
||||||
|
@completed = @autoComplete.getAutocomplete('tabe ' + filePath)
|
||||||
|
|
||||||
|
it "returns no completions", ->
|
||||||
|
expected = '';
|
||||||
|
expect(@completed).toEqual(expected)
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ describe "the commands", ->
|
||||||
[editor, editorElement, vimState, exState, dir, dir2] = []
|
[editor, editorElement, vimState, exState, dir, dir2] = []
|
||||||
projectPath = (fileName) -> path.join(dir, fileName)
|
projectPath = (fileName) -> path.join(dir, fileName)
|
||||||
beforeEach ->
|
beforeEach ->
|
||||||
vimMode = atom.packages.loadPackage('vim-mode')
|
vimMode = atom.packages.loadPackage('vim-mode-plus')
|
||||||
exMode = atom.packages.loadPackage('ex-mode')
|
exMode = atom.packages.loadPackage('ex-mode')
|
||||||
waitsForPromise ->
|
waitsForPromise ->
|
||||||
activationPromise = exMode.activate()
|
activationPromise = exMode.activate()
|
||||||
|
|
@ -42,7 +42,6 @@ describe "the commands", ->
|
||||||
editor = editorElement.getModel()
|
editor = editorElement.getModel()
|
||||||
vimState = vimMode.mainModule.getEditorState(editor)
|
vimState = vimMode.mainModule.getEditorState(editor)
|
||||||
exState = exMode.mainModule.exStates.get(editor)
|
exState = exMode.mainModule.exStates.get(editor)
|
||||||
vimState.activateNormalMode()
|
|
||||||
vimState.resetNormalMode()
|
vimState.resetNormalMode()
|
||||||
editor.setText("abc\ndef\nabc\ndef")
|
editor.setText("abc\ndef\nabc\ndef")
|
||||||
|
|
||||||
|
|
@ -90,6 +89,33 @@ describe "the commands", ->
|
||||||
submitNormalModeInputText '-2'
|
submitNormalModeInputText '-2'
|
||||||
expect(editor.getCursorBufferPosition()).toEqual [0, 0]
|
expect(editor.getCursorBufferPosition()).toEqual [0, 0]
|
||||||
|
|
||||||
|
it "limits to the last line", ->
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText '10'
|
||||||
|
expect(editor.getCursorBufferPosition()).toEqual [3, 0]
|
||||||
|
editor.setCursorBufferPosition([0, 0])
|
||||||
|
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText '3,10'
|
||||||
|
expect(editor.getCursorBufferPosition()).toEqual [3, 0]
|
||||||
|
editor.setCursorBufferPosition([0, 0])
|
||||||
|
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText '$+1000'
|
||||||
|
expect(editor.getCursorBufferPosition()).toEqual [3, 0]
|
||||||
|
editor.setCursorBufferPosition([0, 0])
|
||||||
|
|
||||||
|
it "goes to the first line with address 0", ->
|
||||||
|
editor.setCursorBufferPosition([2, 0])
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText '0'
|
||||||
|
expect(editor.getCursorBufferPosition()).toEqual [0, 0]
|
||||||
|
|
||||||
|
editor.setCursorBufferPosition([2, 0])
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText '0,0'
|
||||||
|
expect(editor.getCursorBufferPosition()).toEqual [0, 0]
|
||||||
|
|
||||||
it "doesn't move when the address is the current line", ->
|
it "doesn't move when the address is the current line", ->
|
||||||
openEx()
|
openEx()
|
||||||
submitNormalModeInputText '.'
|
submitNormalModeInputText '.'
|
||||||
|
|
@ -458,6 +484,13 @@ describe "the commands", ->
|
||||||
submitNormalModeInputText('xit')
|
submitNormalModeInputText('xit')
|
||||||
expect(Ex.wq).toHaveBeenCalled()
|
expect(Ex.wq).toHaveBeenCalled()
|
||||||
|
|
||||||
|
describe ":x", ->
|
||||||
|
it "acts as an alias to :xit", ->
|
||||||
|
spyOn(Ex, 'xit')
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText('x')
|
||||||
|
expect(Ex.xit).toHaveBeenCalled()
|
||||||
|
|
||||||
describe ":wqall", ->
|
describe ":wqall", ->
|
||||||
it "calls :wall, then :quitall", ->
|
it "calls :wall, then :quitall", ->
|
||||||
spyOn(Ex, 'wall')
|
spyOn(Ex, 'wall')
|
||||||
|
|
@ -682,6 +715,17 @@ describe "the commands", ->
|
||||||
submitNormalModeInputText(':%substitute/abc/ghi/ig')
|
submitNormalModeInputText(':%substitute/abc/ghi/ig')
|
||||||
expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nghiaghi')
|
expect(editor.getText()).toEqual('ghiaghi\ndefdDEF\nghiaghi')
|
||||||
|
|
||||||
|
it "set gdefault option", ->
|
||||||
|
openEx()
|
||||||
|
atom.config.set('ex-mode.gdefault', true)
|
||||||
|
submitNormalModeInputText(':substitute/a/x')
|
||||||
|
expect(editor.getText()).toEqual('xbcxABC\ndefdDEF\nabcaABC')
|
||||||
|
|
||||||
|
atom.commands.dispatch(editorElement, 'ex-mode:open')
|
||||||
|
atom.config.set('ex-mode.gdefault', true)
|
||||||
|
submitNormalModeInputText(':substitute/a/x/g')
|
||||||
|
expect(editor.getText()).toEqual('xbcaABC\ndefdDEF\nabcaABC')
|
||||||
|
|
||||||
describe ":yank", ->
|
describe ":yank", ->
|
||||||
beforeEach ->
|
beforeEach ->
|
||||||
editor.setText('abc\ndef\nghi\njkl')
|
editor.setText('abc\ndef\nghi\njkl')
|
||||||
|
|
@ -911,6 +955,14 @@ describe "the commands", ->
|
||||||
submitNormalModeInputText(':set nosmartcase')
|
submitNormalModeInputText(':set nosmartcase')
|
||||||
expect(atom.config.get('vim-mode.useSmartcaseForSearch')).toBe(false)
|
expect(atom.config.get('vim-mode.useSmartcaseForSearch')).toBe(false)
|
||||||
|
|
||||||
|
it "sets (no)gdefault", ->
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText(':set gdefault')
|
||||||
|
expect(atom.config.get('ex-mode.gdefault')).toBe(true)
|
||||||
|
atom.commands.dispatch(editorElement, 'ex-mode:open')
|
||||||
|
submitNormalModeInputText(':set nogdefault')
|
||||||
|
expect(atom.config.get('ex-mode.gdefault')).toBe(false)
|
||||||
|
|
||||||
describe "aliases", ->
|
describe "aliases", ->
|
||||||
it "calls the aliased function without arguments", ->
|
it "calls the aliased function without arguments", ->
|
||||||
ExClass.registerAlias('W', 'w')
|
ExClass.registerAlias('W', 'w')
|
||||||
|
|
@ -950,3 +1002,18 @@ describe "the commands", ->
|
||||||
expect(calls.length).toEqual 2
|
expect(calls.length).toEqual 2
|
||||||
expect(calls[0].args[0].range).toEqual [0, 2]
|
expect(calls[0].args[0].range).toEqual [0, 2]
|
||||||
expect(calls[1].args[0].range).toEqual [3, 3]
|
expect(calls[1].args[0].range).toEqual [3, 3]
|
||||||
|
|
||||||
|
describe ':sort', ->
|
||||||
|
beforeEach ->
|
||||||
|
editor.setText('ghi\nabc\njkl\ndef\n142\nzzz\n91xfds9\n')
|
||||||
|
editor.setCursorBufferPosition([0, 0])
|
||||||
|
|
||||||
|
it "sorts entire file if range is not multi-line", ->
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText('sort')
|
||||||
|
expect(editor.getText()).toEqual('142\n91xfds9\nabc\ndef\nghi\njkl\nzzz\n')
|
||||||
|
|
||||||
|
it "sorts specific range if range is multi-line", ->
|
||||||
|
openEx()
|
||||||
|
submitNormalModeInputText('2,4sort')
|
||||||
|
expect(editor.getText()).toEqual('ghi\nabc\ndef\njkl\n142\nzzz\n91xfds9\n')
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ helpers = require './spec-helper'
|
||||||
describe "the input element", ->
|
describe "the input element", ->
|
||||||
[editor, editorElement, vimState, exState] = []
|
[editor, editorElement, vimState, exState] = []
|
||||||
beforeEach ->
|
beforeEach ->
|
||||||
vimMode = atom.packages.loadPackage('vim-mode')
|
vimMode = atom.packages.loadPackage('vim-mode-plus')
|
||||||
exMode = atom.packages.loadPackage('ex-mode')
|
exMode = atom.packages.loadPackage('ex-mode')
|
||||||
waitsForPromise ->
|
waitsForPromise ->
|
||||||
activationPromise = exMode.activate()
|
activationPromise = exMode.activate()
|
||||||
|
|
@ -26,7 +26,6 @@ describe "the input element", ->
|
||||||
atom.commands.dispatch(getCommandEditor(), "core:cancel")
|
atom.commands.dispatch(getCommandEditor(), "core:cancel")
|
||||||
vimState = vimMode.mainModule.getEditorState(editor)
|
vimState = vimMode.mainModule.getEditorState(editor)
|
||||||
exState = exMode.mainModule.exStates.get(editor)
|
exState = exMode.mainModule.exStates.get(editor)
|
||||||
vimState.activateNormalMode()
|
|
||||||
vimState.resetNormalMode()
|
vimState.resetNormalMode()
|
||||||
editor.setText("abc\ndef\nabc\ndef")
|
editor.setText("abc\ndef\nabc\ndef")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue