casraf/vim-matchup
1
0
Fork 0
mirror of https://github.com/chenasraf/vim-matchup.git synced 2026-05-18 01:38:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for %: don't move or operate if no match

Browse Source
This commit is contained in:
Andy K. Massimino
2017-11-28 11:00:06 -05:00
parent 31a830727f
commit ba7ae53f80
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
autoload/matchup/motion.vim
View File

@@ -87,11 +87,17 @@ endfunction
function! matchup#motion#find_matching_pair(visual, down) " {{{1
let [l:count, l:count1] = [v:count, v:count1]
if a:visual
let l:is_oper = !empty(get(s:, 'v_operator', ''))
if a:visual && !l:is_oper
normal! gv
endif
if a:down && l:count > g:matchup_motion_override_Npercent
" TODO: dv50% does not work properly
if a:visual && l:is_oper
normal! V
endif
exe 'normal!' l:count.'%'
return
endif
@@ -109,13 +115,17 @@ function! matchup#motion#find_matching_pair(visual, down) " {{{1
" loop count number of times
for l:dummy in range(l:count1)
let l:match = matchup#delim#get_matching(l:delim)
let l:matches = matchup#delim#get_matching(l:delim, 1)
if len(l:matches) <= 1 | return | endif
if !has_key(l:delim, 'links') | return | endif
let l:delim = get(l:delim.links, a:down ? 'next' : 'prev', {})
if empty(l:delim) | return | endif
endfor
let l:is_oper = !empty(get(s:, 'v_operator', ''))
if a:visual && l:is_oper
normal! gv
endif
let l:exclusive = l:is_oper && (g:v_motion_force ==# 'v')
let l:forward = ((a:down && l:delim.side !=# 'open')
\ || l:delim.side ==# 'close')