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

Better handling of indentation

Browse Source
This commit is contained in:
Alex Yatskov 2014-12-02 06:12:02 +09:00
parent e9ed21a996
commit 4aadd46bbf
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
argwrap.vim
View File

@ -51,7 +51,6 @@ endfunction
function! argwrap#findClosestRange() function! argwrap#findClosestRange()
let l:ranges = [] let l:ranges = []
for l:braces in [["(", ")"], ["\\[", "\\]"], ["{", "}"]] for l:braces in [["(", ")"], ["\\[", "\\]"], ["{", "}"]]
let l:range = argwrap#findRange(braces) let l:range = argwrap#findRange(braces)
if argwrap#validateRange(l:range) if argwrap#validateRange(l:range)
@ -132,18 +131,24 @@ function! argwrap#extractArguments(text)
endfunction endfunction
function! argwrap#extractContainer(range) function! argwrap#extractContainer(range)
let l:prefix = getline(a:range.lineStart)[: a:range.colStart - 1] let l:textStart = getline(a:range.lineStart)
let l:suffix = getline(a:range.lineEnd)[a:range.colEnd - 1:] let l:textEnd = getline(a:range.lineEnd)
return {"prefix": l:prefix, "suffix": l:suffix}
let l:indent = match(l:textStart, "\\S")
let l:prefix = l:textStart[l:indent : a:range.colStart - 1]
let l:suffix = l:textEnd[a:range.colEnd - 1:]
return {"indent": l:indent, "prefix": l:prefix, "suffix": l:suffix}
endfunction endfunction
function! argwrap#wrapContainer(range, container, arguments) function! argwrap#wrapContainer(range, container, arguments)
let l:argCount = len(a:arguments) let l:argCount = len(a:arguments)
let l:padding = repeat(" ", a:container.indent)
let l:line = a:range.lineStart let l:line = a:range.lineStart
call setline(l:line, a:container.prefix) call setline(l:line, l:padding . a:container.prefix)
for l:index in range(l:argCount) for l:index in range(l:argCount)
let l:text = a:arguments[l:index] let l:text = l:padding . a:arguments[l:index]
if l:index < l:argCount - 1 if l:index < l:argCount - 1
let l:text .= "," let l:text .= ","
endif endif
@ -152,11 +157,11 @@ function! argwrap#wrapContainer(range, container, arguments)
let l:line += 1 let l:line += 1
exec printf("%s>", l:line) exec printf("%s>", l:line)
endfor endfor
call append(l:line, a:container.suffix) call append(l:line, l:padding . a:container.suffix)
endfunction endfunction
function! argwrap#unwrapContainer(range, container, arguments) function! argwrap#unwrapContainer(range, container, arguments)
let l:text = a:container.prefix . join(a:arguments, ", ") . a:container.suffix let l:text = repeat(" ", a:container.indent) . a:container.prefix . join(a:arguments, ", ") . a:container.suffix
call setline(a:range.lineStart, l:text) call setline(a:range.lineStart, l:text)
exec printf("%d,%dd", a:range.lineStart + 1, a:range.lineEnd) exec printf("%d,%dd", a:range.lineStart + 1, a:range.lineEnd)
endfunction endfunction

8
sample.txt
View File

@ -1,4 +1,4 @@
a = Foo(a, [b, z], "hello, world", c) a = Foo("a": 4, "z": 2, [b, z], "hello, world", c)
Foo(a, b) Foo(a, b)
@ -8,7 +8,11 @@ Foo(
d d
) )
Foo(a, [b, "c"], d) Foo(
a,
[b, "c"],
d
)
Foo( Foo(
a, a,