diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-13 23:10:56 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-13 23:10:56 +1200 |
commit | 3ee3a40b4cdee2a4612287245c34cc3763abb053 (patch) | |
tree | ac6df32c12219a3331019fca86a43225730a365e | |
parent | Merge branch 'hotfix/v2.0.1' into develop (diff) | |
download | vim-put-blank-lines-3ee3a40b4cdee2a4612287245c34cc3763abb053.tar.gz vim-put-blank-lines-3ee3a40b4cdee2a4612287245c34cc3763abb053.zip |
Refactor to use <expr> mappings
-rw-r--r-- | autoload/put_blank_lines.vim | 16 | ||||
-rw-r--r-- | plugin/put_blank_lines.vim | 9 |
2 files changed, 13 insertions, 12 deletions
diff --git a/autoload/put_blank_lines.vim b/autoload/put_blank_lines.vim index 2ee8ce8..6251283 100644 --- a/autoload/put_blank_lines.vim +++ b/autoload/put_blank_lines.vim @@ -1,18 +1,18 @@ -function! put_blank_lines#Above(count) abort +" Put lines above +function! put_blank_lines#Above() abort set operatorfunc=put_blank_lines#AboveOpfunc - call feedkeys(a:count.'g@l', 'n') + return 'g@^' endfunction - -function! put_blank_lines#Below(count) abort - set operatorfunc=put_blank_lines#BelowOpfunc - call feedkeys(a:count.'g@l', 'n') -endfunction - function! put_blank_lines#AboveOpfunc(type) abort silent put! =repeat(nr2char(10), v:count1) ']+1 endfunction +" Put lines below +function! put_blank_lines#Below() abort + set operatorfunc=put_blank_lines#BelowOpfunc + return 'g@^' +endfunction function! put_blank_lines#BelowOpfunc(type) abort silent put =repeat(nr2char(10), v:count1) '[-1 diff --git a/plugin/put_blank_lines.vim b/plugin/put_blank_lines.vim index ede964a..922b4e4 100644 --- a/plugin/put_blank_lines.vim +++ b/plugin/put_blank_lines.vim @@ -13,9 +13,10 @@ if v:version < 700 endif let g:loaded_put_blank_lines = 1 -nnoremap <silent> <unique> +" Set up mappings to autoloaded functions +nnoremap <expr> <silent> <unique> \ <Plug>(PutBlankLinesBelow) - \ :<C-U>call put_blank_lines#Below(v:count1)<CR> -nnoremap <silent> <unique> + \ put_blank_lines#Below() +nnoremap <expr> <silent> <unique> \ <Plug>(PutBlankLinesAbove) - \ :<C-U>call put_blank_lines#Above(v:count1)<CR> + \ put_blank_lines#Above() |