alex/vim-argwrap
1
Fork 0
Code Releases 1 Activity

Adding bx style wrapping

Browse Source
This commit is contained in:
Alex Yatskov 2014-12-03 10:34:28 +09:00
parent 1d469f1971
commit c5f010787e
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
autoload/argwrap.vim
View File

@ -139,23 +139,47 @@ function! argwrap#extractContainer(range)
return {'indent': l:indent, 'prefix': l:prefix, 'suffix': l:suffix} return {'indent': l:indent, 'prefix': l:prefix, 'suffix': l:suffix}
endfunction endfunction
function! argwrap#wrapContainer(range, container, arguments) function! argwrap#wrapContainer(range, container, arguments, style)
let l:argCount = len(a:arguments) let l:argCount = len(a:arguments)
let l:padding = repeat(' ', a:container.indent) let l:padding = repeat(' ', a:container.indent)
let l:line = a:range.lineStart let l:line = a:range.lineStart
call setline(l:line, l:padding . a:container.prefix) if a:style ==? 'default'
for l:index in range(l:argCount) call setline(l:line, l:padding . a:container.prefix)
let l:text = l:padding . a:arguments[l:index]
if l:index < l:argCount - 1 for l:index in range(l:argCount)
let l:text .= ',' let l:text = l:padding . a:arguments[l:index]
if l:index < l:argCount - 1
let l:text .= ','
endif
call append(l:line, l:text)
let l:line += 1
exec printf('%s>', l:line)
endfor
call append(l:line, l:padding . a:container.suffix)
elseif a:style ==? 'bx'
let l:lineText = l:padding . a:container.prefix
if l:argCount > 0
let l:lineText .= a:arguments[0]
let l:arguments = a:arguments[1:]
let l:argCount -= 1
endif endif
call append(l:line, l:text) call setline(l:line, l:lineText)
let l:line += 1
exec printf('%s>', l:line) for l:index in range(l:argCount)
endfor let l:text = ', ' . l:padding . l:arguments[l:index]
call append(l:line, l:padding . a:container.suffix)
call append(l:line, l:text)
let l:line += 1
exec printf('%s>', l:line)
endfor
call append(l:line, l:padding . a:container.suffix)
exec printf('%s>', l:line + 1)
endif
endfunction endfunction
function! argwrap#unwrapContainer(range, container, arguments) function! argwrap#unwrapContainer(range, container, arguments)
@ -164,7 +188,8 @@ function! argwrap#unwrapContainer(range, container, arguments)
exec printf('silent %d,%dd_', a:range.lineStart + 1, a:range.lineEnd) exec printf('silent %d,%dd_', a:range.lineStart + 1, a:range.lineEnd)
endfunction endfunction
function! argwrap#toggle() function! argwrap#toggle(...)
let l:style = a:0 == 0 ? 'default' : 'bx'
let l:cursor = getpos('.') let l:cursor = getpos('.')
let l:range = argwrap#findClosestRange() let l:range = argwrap#findClosestRange()
@ -180,7 +205,7 @@ function! argwrap#toggle()
let l:container = argwrap#extractContainer(l:range) let l:container = argwrap#extractContainer(l:range)
if l:range.lineStart == l:range.lineEnd if l:range.lineStart == l:range.lineEnd
call argwrap#wrapContainer(l:range, l:container, l:arguments) call argwrap#wrapContainer(l:range, l:container, l:arguments, l:style)
else else
call argwrap#unwrapContainer(l:range, l:container, l:arguments) call argwrap#unwrapContainer(l:range, l:container, l:arguments)
endif endif