vim/vim-exchange
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Indent overlapping regions correctly

Browse Source
This commit is contained in:
Jacob Niehus 2015-05-31 10:21:32 -07:00
parent aff4ade39b
commit 3b4b4b38ab
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/exchange.vim
View File

@ -8,6 +8,13 @@ function! s:exchange(x, y, reverse, expand)
let selection = &selection let selection = &selection
set selection=inclusive set selection=inclusive
let indent = exists("b:exchange_indent") ? (b:exchange_indent !~ 0) :
\ (exists("g:exchange_indent") && (g:exchange_indent !~ 0))
if indent
let xindent = matchstr(getline(nextnonblank(a:y[2][1])), '^\s*')
let yindent = matchstr(getline(nextnonblank(a:x[2][1])), '^\s*')
endif
call setpos("'[", a:y[2]) call setpos("'[", a:y[2])
call setpos("']", a:y[3]) call setpos("']", a:y[3])
call setreg('z', a:x[0], a:x[1]) call setreg('z', a:x[0], a:x[1])
@ -20,13 +27,10 @@ function! s:exchange(x, y, reverse, expand)
silent exe "normal! `[" . a:x[1] . "`]\"zp" silent exe "normal! `[" . a:x[1] . "`]\"zp"
endif endif
if exists("b:exchange_indent") ? (b:exchange_indent !~ 0) : if indent
\ (exists("g:exchange_indent") && (g:exchange_indent !~ 0))
let xlines = 1 + a:x[3][1] - a:x[2][1] let xlines = 1 + a:x[3][1] - a:x[2][1]
let xindent = matchstr(getline(nextnonblank(a:x[2][1])), '^\s*') let ylines = a:expand ? xlines : 1 + a:y[3][1] - a:y[2][1]
let ylines = 1 + a:y[3][1] - a:y[2][1] if !a:expand && a:y[1] ==# 'V'
let yindent = matchstr(getline(nextnonblank(a:y[2][1])), '^\s*')
if a:y[1] ==# 'V'
call s:reindent(a:x[2][1], ylines, yindent) call s:reindent(a:x[2][1], ylines, yindent)
endif endif
if a:x[1] ==# 'V' if a:x[1] ==# 'V'