Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(see #274) fix AutoPairsFastWrap: remove wrong \ inside [] #269

Closed
wants to merge 2 commits into from
Closed

(see #274) fix AutoPairsFastWrap: remove wrong \ inside [] #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6830ee
fix AutoPairsFastWrap: remove wrong `\` inside `[]`
tomtomjhj Oct 2, 2019
00a2857
fix of vimscript quote by lemeb
tomtomjhj Oct 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions plugin/auto-pairs.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ func! AutoPairsDefaultPairs()
if exists('b:autopairs_defaultpairs')
return b:autopairs_defaultpairs
end
" Added a more complex regex to capture in-line VimL comments
let no_quotes = '(\\\"|[^"])*'
let com_inl = '|^("'.no_quotes.'"*|[^"])* \zs"\ze'.no_quotes.'$'
let r = copy(g:AutoPairs)
let allPairs = {
\ 'vim': {'\v^\s*\zs"': ''},
\ 'vim': {'\v^\s*\zs"'.com_inl: ''},
\ 'rust': {'\w\zs<': '>', '&\zs''': ''},
\ 'php': {'<?': '?>//k]', '<?php': '?>//k]'}
\ }
Expand Down Expand Up @@ -221,7 +224,7 @@ func! AutoPairsInsert(key)
" when <!-- is detected the inserted pair < > should be clean up
let target = ms[1]
let openPair = ms[2]
if len(openPair) == 1 && m == openPair
if (len(openPair) == 1 && m == openPair) || (close == '')
break
end
let bs = ''
Expand Down Expand Up @@ -289,7 +292,6 @@ func! AutoPairsInsert(key)
end
endfor


" Fly Mode, and the key is closed-pairs, search closed-pair and jump
if g:AutoPairsFlyMode && a:key =~ '\v[\}\]\)]'
if search(a:key, 'We')
Expand All @@ -307,8 +309,9 @@ func! AutoPairsDelete()

let [before, after, ig] = s:getline()
for [open, close, opt] in b:AutoPairsList
let rest_of_line = opt['multiline'] ? after : ig
let b = matchstr(before, '\V'.open.'\v\s?$')
let a = matchstr(after, '^\v\s*\V'.close)
let a = matchstr(rest_of_line, '^\v\s*\V'.close)
if b != '' && a != ''
if b[-1:-1] == ' '
if a[0] == ' '
Expand Down Expand Up @@ -338,7 +341,7 @@ func! AutoPairsFastWrap()
let c = @"
normal! x
let [before, after, ig] = s:getline()
if after[0] =~ '\v[\{\[\(\<]'
if after[0] =~ '\v[{[(<]'
normal! %
normal! p
else
Expand Down Expand Up @@ -495,7 +498,7 @@ func! AutoPairsInit()
let c = close[0]
let opt = {'mapclose': 1, 'multiline':1}
let opt['key'] = c
if o == c
if o == c || len(c) == 0
let opt['multiline'] = 0
end
let m = matchlist(close, '\v(.*)//(.*)$')
Expand Down