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

Add forcing for z%, better z% motion

Browse Source
This commit is contained in:
Andy K. Massimino
2017-11-08 00:47:22 -05:00
parent 0c2616d914
commit a762646f84
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/matchup.vim
View File

@@ -98,13 +98,14 @@ function! s:init_default_mappings()
call s:map('n', 'z%', '<plug>(matchup-z%)')
call s:map('x', 'z%', '<plug>(matchup-z%)')
call s:map('o', 'z%', '<plug>(matchup-z%)')
for l:opforce in ['', 'v', 'V', '<c-v>']
call s:map('o', l:opforce.']%',
\ '<plug>(matchup-o_'.l:opforce.')<plug>(matchup-]%)')
call s:map('o', l:opforce.'[%',
\ '<plug>(matchup-o_'.l:opforce.')<plug>(matchup-[%)')
call s:map('o', l:opforce.'z%',
\ '<plug>(matchup-o_'.l:opforce.')<plug>(matchup-z%)')
endfor
endif

17
autoload/matchup/motion.vim
View File

@@ -68,8 +68,9 @@ function! matchup#motion#init_module() " {{{1
xnoremap <silent> <sid>(matchup-z%)
\ :<c-u>call matchup#motion#jump_inside(1)<cr>
xmap <silent> <plug>(matchup-z%) <sid>(matchup-z%)
onoremap <silent> <plug>(matchup-z%)
\ :<c-u>call <sid>oper("normal \<sid>(v)"
\ :<c-u>call <sid>oper("normal \<sid>(wise)"
\ . v:count1 . "\<sid>(matchup-z%)")<cr>
endfunction
@@ -231,8 +232,6 @@ endfunction
" }}}1
function! matchup#motion#jump_inside(visual) " {{{1
" TODO handle count
let l:count = v:count1
let l:save_pos = matchup#pos#get_cursor()
@@ -241,8 +240,15 @@ function! matchup#motion#jump_inside(visual) " {{{1
normal! gv
endif
for l:dummy in range(l:count)
let l:delim = matchup#delim#get_next('all', 'open')
for l:counter in range(l:count)
if l:counter
let l:delim = matchup#delim#get_next('all', 'open')
else
let l:delim = matchup#delim#get_current('all', 'open')
if empty(l:delim)
let l:delim = matchup#delim#get_next('all', 'open')
endif
endif
if empty(l:delim)
call matchup#pos#set_cursor(l:save_pos)
return
@@ -262,6 +268,7 @@ function! matchup#motion#jump_inside(visual) " {{{1
" this is an exclusive motion except when dealing with whitespace
if !empty(get(s:, 'v_operator', ''))
\ && g:v_motion_force !=# 'v' && g:v_motion_force !=# "\<c-v>"
while matchup#util#in_whitespace(l:new_pos[1], l:new_pos[2])
let l:new_pos = matchup#pos#next(l:new_pos)
endwhile