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

Optimize code

Browse Source
This commit is contained in:
Miao Jiang 2019-01-22 23:43:40 +08:00
parent f0b00a1c63
commit 0682eb08cb
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugin/auto-pairs.vim
View File

@ -120,7 +120,7 @@ func! s:getline()
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 let afterline = after
if a:0 == 0 && g:AutoPairsMultilineClose if g:AutoPairsMultilineClose
let n = line('$') let n = line('$')
let i = line('.')+1 let i = line('.')+1
while i <= n while i <= n
@ -136,6 +136,7 @@ func! s:getline()
endf endf
" split text to two part " split text to two part
" returns [orig, text_before_open, open]
func! s:matchend(text, open) func! s:matchend(text, open)
let m = matchstr(a:text, '\V'.a:open.'\v$') let m = matchstr(a:text, '\V'.a:open.'\v$')
if m == "" if m == ""
@ -144,6 +145,7 @@ func! s:matchend(text, open)
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
" returns [orig, close, text_after_close]
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 == ""
@ -223,40 +225,37 @@ func! AutoPairsInsert(key)
" 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 <?
let target = ms[1] let target = ms[1]
let openPair = ms[2] let openPair = ms[2]
let i = 0
let bs = '' let bs = ''
let del = '' let del = ''
while len(before) >= len(target) && target != before while len(before) > len(target) && target != before
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 ms = s:matchend(before, o) let os = s:matchend(before, o)
if len(ms) > 0 if len(os) && len(os[1]) < len(target)
let found = 1 " any text before openPair should not be deleted
let before = ms[1] continue
" delete open pair
let bs = bs.s:backspace(ms[2])
" delete close pair
let ms = s:matchbegin(afterline, c)
if len(ms) > 0
let del = del.s:delete(ms[1])
let afterline = ms[2]
end end
let cs = s:matchbegin(afterline, c)
if len(os) && len(cs)
let found = 1
let before = os[1]
let afterline = cs[2]
let bs = bs.s:backspace(os[2])
let del = del.s:delete(cs[1])
break break
end end
endfor endfor
if !found if !found
" delete charactor " delete charactor
let ms = s:matchend(before, '\v.') let ms = s:matchend(before, '\v.')
if len(ms) == 0 if len(ms)
break
end
let before = ms[1] let before = ms[1]
let bs = bs.s:backspace(ms[2]) let bs = bs.s:backspace(ms[2])
end end
end
endwhile endwhile
return bs.del.openPair.close.s:left(close) return bs.del.openPair.close.s:left(close)
end end
@ -289,7 +288,7 @@ func! AutoPairsDelete()
return "\<BS>" return "\<BS>"
end end
end end
return repeat("\<BS>", s:ulen(b)).repeat("\<DELETE>", s:ulen(a)) return s:backspace(b).s:delete(a)
end end
endfor endfor