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

Close empty pairs smartly

Browse Source
This commit is contained in:
Miao Jiang 2019-01-15 22:26:37 +08:00
parent 7d721d261f
commit 38d53d4df0
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugin/auto-pairs.vim
View File

@ -114,11 +114,12 @@ func! s:backspace(s)
return repeat("\<BS>", s:ulen(a:s)) return repeat("\<BS>", s:ulen(a:s))
endf endf
func! s:getline(...) func! s:getline()
let line = getline('.') let line = getline('.')
let pos = col('.') - 1 let pos = col('.') - 1
let before = strpart(line, 0, pos) let before = strpart(line, 0, pos)
let after = strpart(line, pos) let after = strpart(line, pos)
let afterline = after
if a:0 == 0 && g:AutoPairsMultilineClose if a:0 == 0 && g:AutoPairsMultilineClose
let n = line('$') let n = line('$')
let i = line('.')+1 let i = line('.')+1
@ -131,7 +132,7 @@ func! s:getline(...)
let i = i+1 let i = i+1
endwhile endwhile
end end
return [before, after] return [before, after, afterline]
endf endf
" split text to two part " split text to two part
@ -176,7 +177,7 @@ func! AutoPairsInsert(key)
let b:autopairs_saved_pair = [a:key, getpos('.')] let b:autopairs_saved_pair = [a:key, getpos('.')]
let [before, after] = s:getline() let [before, after, afterline] = s:getline()
" Ignore auto close if prev character is \ " Ignore auto close if prev character is \
if before[-1:-1] == '\' if before[-1:-1] == '\'
@ -186,16 +187,20 @@ func! AutoPairsInsert(key)
" check close pairs " check close pairs
for [open, close] in b:AutoPairsList for [open, close] in b:AutoPairsList
if a:key == g:AutoPairsWildClosedPair || close[0] == a:key if a:key == g:AutoPairsWildClosedPair || close[0] == a:key
if open == close " the close pair is in the same line
let [before, after] = s:getline(0) let m = matchstr(afterline, '^\v\s*\V'.close)
end if m != ''
let m = s:matchbegin(after, '\v\s*\zs\V'.close) if before =~ '\V'.open.'\v\s*$' && m[0] =~ '\v\s'
if len(m) > 0 " remove the space we inserted if the text in pairs is blank
" skip close pair return "\<DEL>".s:right(m[1:])
let c = matchstr(after, '^\V'.close)
if c != ""
return s:right(c)
else else
return s:right(m)
end
end
if open != close
let m = s:matchend(after, '^\v\s*\zs\V'.close)
if len(m) > 0
" skip close pair greedy
call search(m[1], 'We') call search(m[1], 'We')
return "\<Right>" return "\<Right>"
end end
@ -265,7 +270,7 @@ func! AutoPairsDelete()
return "\<BS>" return "\<BS>"
end end
let [before, after] = s:getline() let [before, after, ig] = s:getline()
for [open, close] in b:AutoPairsList for [open, close] in b:AutoPairsList
let b = matchstr(before, '\V'.open.'\v\s?$') let b = matchstr(before, '\V'.open.'\v\s?$')
let a = matchstr(after, '^\v\s*\V'.close) let a = matchstr(after, '^\v\s*\V'.close)
@ -288,7 +293,7 @@ endf
func! AutoPairsFastWrap() func! AutoPairsFastWrap()
let c = @" let c = @"
normal! x normal! x
let [before, after] = s:getline() let [before, after, ig] = s:getline()
if after[0] =~ '\v[\{\[\(\<]' if after[0] =~ '\v[\{\[\(\<]'
normal! % normal! %
normal! p normal! p
@ -301,8 +306,12 @@ func! AutoPairsFastWrap()
return "" return ""
end end
endfor endfor
normal! e if after[1:1] =~ '\v[a-zA-Z0-9_]'
normal! p normal! e
normal! p
else
normal! p
end
end end
let @" = c let @" = c
return "" return ""
@ -367,7 +376,7 @@ func! AutoPairsSpace()
return "\<SPACE>" return "\<SPACE>"
end end
let [before, after] = s:getline() let [before, after, ig] = s:getline()
for [open, close] in b:AutoPairsList for [open, close] in b:AutoPairsList
if before =~ '\V'.open.'\v$' && after =~ '^\V'.close if before =~ '\V'.open.'\v$' && after =~ '^\V'.close