vim/vimtex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed #622: Ignore delims in comments when closing

Browse Source
This commit is contained in:
Karl Yngve Lervåg 2016-11-08 23:07:44 +01:00
parent 66c0446cb5
commit 55a5923869
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
autoload/vimtex/delim.vim
View File

@ -227,7 +227,8 @@ function! vimtex#delim#close() " {{{1
let l:lnum = l:save_pos[1] + 1 let l:lnum = l:save_pos[1] + 1
while l:lnum > 1 while l:lnum > 1
let l:open = vimtex#delim#get_prev('all', 'open') let l:open = vimtex#delim#get_prev('all', 'open',
\ { 'syn_exclude' : 'texComment' })
if empty(l:open) || get(l:open, 'name', '') ==# 'document' if empty(l:open) || get(l:open, 'name', '') ==# 'document'
break break
endif endif
@ -364,30 +365,30 @@ endfunction
" }}}1 " }}}1
function! vimtex#delim#get_next(type, side) " {{{1 function! vimtex#delim#get_next(type, side, ...) " {{{1
return s:get_delim({ return s:get_delim(extend({
\ 'direction' : 'next', \ 'direction' : 'next',
\ 'type' : a:type, \ 'type' : a:type,
\ 'side' : a:side, \ 'side' : a:side,
\}) \}, get(a:, '1', {})))
endfunction endfunction
" }}}1 " }}}1
function! vimtex#delim#get_prev(type, side) " {{{1 function! vimtex#delim#get_prev(type, side, ...) " {{{1
return s:get_delim({ return s:get_delim(extend({
\ 'direction' : 'prev', \ 'direction' : 'prev',
\ 'type' : a:type, \ 'type' : a:type,
\ 'side' : a:side, \ 'side' : a:side,
\}) \}, get(a:, '1', {})))
endfunction endfunction
" }}}1 " }}}1
function! vimtex#delim#get_current(type, side) " {{{1 function! vimtex#delim#get_current(type, side, ...) " {{{1
return s:get_delim({ return s:get_delim(extend({
\ 'direction' : 'current', \ 'direction' : 'current',
\ 'type' : a:type, \ 'type' : a:type,
\ 'side' : a:side, \ 'side' : a:side,
\}) \}, get(a:, '1', {})))
endfunction endfunction
" }}}1 " }}}1
@ -475,6 +476,7 @@ function! s:get_delim(opts) " {{{1
" 'side' : open " 'side' : open
" close " close
" both " both
" 'syn_exclude' : Don't match in given syntax
" } " }
" "
" Returns: " Returns:
@ -492,12 +494,26 @@ function! s:get_delim(opts) " {{{1
" } " }
" } " }
" "
let l:save_pos = getpos('.')
let l:re = s:re[a:opts.type][a:opts.side] let l:re = s:re[a:opts.type][a:opts.side]
while 1
let [l:lnum, l:cnum] = a:opts.direction ==# 'next' let [l:lnum, l:cnum] = a:opts.direction ==# 'next'
\ ? searchpos(l:re, 'cnW', line('.') + s:stopline) \ ? searchpos(l:re, 'cnW', line('.') + s:stopline)
\ : a:opts.direction ==# 'prev' \ : a:opts.direction ==# 'prev'
\ ? searchpos(l:re, 'bcnW', max([line('.') - s:stopline, 1])) \ ? searchpos(l:re, 'bcnW', max([line('.') - s:stopline, 1]))
\ : searchpos(l:re, 'bcnW', line('.')) \ : searchpos(l:re, 'bcnW', line('.'))
if l:lnum == 0 | break | endif
if has_key(a:opts, 'syn_exclude')
\ && vimtex#util#in_syntax(a:opts.syn_exclude, l:lnum, l:cnum)
call setpos('.', s:pos_prev(l:lnum, l:cnum))
continue
endif
break
endwhile
call setpos('.', l:save_pos)
let l:match = matchstr(getline(l:lnum), '^' . l:re, l:cnum-1) let l:match = matchstr(getline(l:lnum), '^' . l:re, l:cnum-1)
if a:opts.direction ==# 'current' if a:opts.direction ==# 'current'