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

Compatible with vim 7.3, fixes #233

Browse Source
This commit is contained in:
Miao Jiang 2019-01-20 12:02:09 +08:00
parent 12dc3a060e
commit 453d488987
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugin/auto-pairs.vim
View File

@ -143,6 +143,7 @@ func! s:matchend(text, open)
end end
return [a:text, strpart(a:text, 0, len(a:text)-len(m)), m] return [a:text, strpart(a:text, 0, len(a:text)-len(m)), m]
endf endf
func! s:matchbegin(text, close) func! s:matchbegin(text, close)
let m = matchstr(a:text, '^\V'.a:close) let m = matchstr(a:text, '^\V'.a:close)
if m == "" if m == ""
@ -186,6 +187,9 @@ func! AutoPairsInsert(key)
" check close pairs " check close pairs
for [open, close, opt] in b:AutoPairsList for [open, close, opt] in b:AutoPairsList
if close == ''
continue
end
if a:key == g:AutoPairsWildClosedPair || opt['mapclose'] && close[0] == a:key if a:key == g:AutoPairsWildClosedPair || opt['mapclose'] && close[0] == a:key
" the close pair is in the same line " the close pair is in the same line
let m = matchstr(afterline, '^\v\s*\V'.close) let m = matchstr(afterline, '^\v\s*\V'.close)
@ -213,38 +217,38 @@ func! AutoPairsInsert(key)
" check open pairs " check open pairs
let text=before.a:key let text=before.a:key
for [open, close, opt] in b:AutoPairsList for [open, close, opt] in b:AutoPairsList
let m = s:matchend(text, open) let ms = s:matchend(text, open)
if len(m) > 0 if len(ms) > 0
" process the open pair " process the open pair
" remove inserted pair " remove inserted pair
" eg: if the pairs include < > and <!-- --> " eg: if the pairs include < > and <!-- -->
" when <!-- is detected the inserted pair < > should be clean up " when <!-- is detected the inserted pair < > should be clean up
" <?php ?> should backspace 4 times php and <? " <?php ?> should backspace 4 times php and <?
let target = m[1] let target = ms[1]
let openPair = m[2] let openPair = ms[2]
let text = before let text = before
let i = 0 let i = 0
while len(text) >= len(target) && target != text while len(text) >= len(target) && target != text
let found = 0 let found = 0
" delete pair " delete pair
for [o, c, opt] in b:AutoPairsList for [o, c, opt] in b:AutoPairsList
let m = s:matchend(text, o) let ms = s:matchend(text, o)
if len(m) > 0 if len(ms) > 0
let found = 1 let found = 1
let text = m[1] let text = ms[1]
let i = i + 1 let i = i + 1
break break
end end
endfor endfor
if !found if !found
" delete charactor " delete charactor
let m = s:matchend(text, '\v.') let ms = s:matchend(text, '\v.')
if len(m) == 0 if len(ms) == 0
break break
end end
let i = i + 1 let i = i + 1
let text = m[1] let text = ms[1]
end end
endwhile endwhile
let bs = repeat("\<BS>", i) let bs = repeat("\<BS>", i)
@ -310,6 +314,9 @@ func! AutoPairsFastWrap()
normal! p normal! p
else else
for [open, close, opt] in b:AutoPairsList for [open, close, opt] in b:AutoPairsList
if close == ''
continue
end
if after =~ '^\s*\V'.open if after =~ '^\s*\V'.open
call search(close, 'We') call search(close, 'We')
normal! p normal! p