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

More cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2014-12-02 09:57:39 +09:00
parent b948dbb2d6
commit 1572562998
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
autoload/argwrap.vim
View File

@ -23,7 +23,7 @@ function! argwrap#validateRange(range)
endfunction endfunction
function! argwrap#compareRanges(range1, range2) function! argwrap#compareRanges(range1, range2)
let [l:buffer, l:line, l:col, l:offset] = getpos(".") let [l:buffer, l:line, l:col, l:offset] = getpos('.')
let l:lineDiff1 = a:range1.lineStart - l:line let l:lineDiff1 = a:range1.lineStart - l:line
let l:colDiff1 = a:range1.colStart - l:col let l:colDiff1 = a:range1.colStart - l:col
@ -44,14 +44,14 @@ function! argwrap#compareRanges(range1, range2)
endfunction endfunction
function! argwrap#findRange(braces) function! argwrap#findRange(braces)
let [l:lineStart, l:colStart] = searchpairpos(a:braces[0], "", a:braces[1], "Wnb") let [l:lineStart, l:colStart] = searchpairpos(a:braces[0], '', a:braces[1], 'Wnb')
let [l:lineEnd, l:colEnd] = searchpairpos(a:braces[0], "", a:braces[1], "Wn") let [l:lineEnd, l:colEnd] = searchpairpos(a:braces[0], '', a:braces[1], 'Wn')
return {"lineStart": l:lineStart, "colStart": l:colStart, "lineEnd": l:lineEnd, "colEnd": l:colEnd} return {'lineStart': l:lineStart, 'colStart': l:colStart, 'lineEnd': l:lineEnd, 'colEnd': l:colEnd}
endfunction 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)
call add(l:ranges, l:range) call add(l:ranges, l:range)
@ -61,12 +61,12 @@ function! argwrap#findClosestRange()
if len(l:ranges) == 0 if len(l:ranges) == 0
return {} return {}
else else
return sort(l:ranges, "argwrap#compareRanges")[0] return sort(l:ranges, 'argwrap#compareRanges')[0]
endif endif
endfunction endfunction
function! argwrap#extractArgumentText(range) function! argwrap#extractArgumentText(range)
let l:text = "" let l:text = ''
for l:lineIndex in range(a:range.lineStart, a:range.lineEnd) for l:lineIndex in range(a:range.lineStart, a:range.lineEnd)
let l:lineText = getline(l:lineIndex) let l:lineText = getline(l:lineIndex)
@ -83,8 +83,8 @@ function! argwrap#extractArgumentText(range)
if l:extractStart < l:extractEnd if l:extractStart < l:extractEnd
let l:extract = l:lineText[l:extractStart : l:extractEnd - 1] let l:extract = l:lineText[l:extractStart : l:extractEnd - 1]
let l:extract = substitute(l:extract, "^\\s\\+", "", "g") let l:extract = substitute(l:extract, '^\\s\\+', '', 'g')
let l:extract = substitute(l:extract, ",$", ", ", "g") let l:extract = substitute(l:extract, ',$', ', ', 'g')
let l:text .= l:extract let l:text .= l:extract
endif endif
endfor endfor
@ -93,10 +93,10 @@ function! argwrap#extractArgumentText(range)
endfunction endfunction
function! argwrap#updateScope(stack, char) function! argwrap#updateScope(stack, char)
let l:pairs = {"\"": "\"", "\'": "\'", ")": "(", "]": "[", "}": "{"} let l:pairs = {'"': '"', '''': '''', ')': '(', ']': '[', '}': '{'}
let l:length = len(a:stack) let l:length = len(a:stack)
if l:length > 0 && get(l:pairs, a:char, "") == a:stack[l:length - 1] if l:length > 0 && get(l:pairs, a:char, '') == a:stack[l:length - 1]
call remove(a:stack, l:length - 1) call remove(a:stack, l:length - 1)
elseif index(values(l:pairs), a:char) >= 0 elseif index(values(l:pairs), a:char) >= 0
call add(a:stack, a:char) call add(a:stack, a:char)
@ -110,15 +110,15 @@ endfunction
function! argwrap#extractArguments(text) function! argwrap#extractArguments(text)
let l:stack = [] let l:stack = []
let l:arguments = [] let l:arguments = []
let l:argument = "" let l:argument = ''
for l:index in range(strlen(a:text)) for l:index in range(strlen(a:text))
let l:char = a:text[l:index] let l:char = a:text[l:index]
call argwrap#updateScope(l:stack, l:char) call argwrap#updateScope(l:stack, l:char)
if len(l:stack) == 0 && l:char == "," if len(l:stack) == 0 && l:char == ','
call add(l:arguments, argwrap#trimArgument(l:argument)) call add(l:arguments, argwrap#trimArgument(l:argument))
let l:argument = "" let l:argument = ''
else else
let l:argument .= l:char let l:argument .= l:char
endif endif
@ -167,8 +167,8 @@ endfunction
function! argwrap#toggle() function! argwrap#toggle()
let l:range = argwrap#findClosestRange() let l:range = argwrap#findClosestRange()
if !argwrap#validateRange(l:range) if !argwrap#validateRange(l:range)
call search('[\(\[\{]') call search('[\(\[\{]', 'W')
call search('[^\(\[\{]') call search('[^\(\[\{]', 'W')
let l:range = argwrap#findClosestRange() let l:range = argwrap#findClosestRange()
if !argwrap#validateRange(l:range) if !argwrap#validateRange(l:range)
return return