Skip to content
Open
Changes from all commits
Commits
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
Support move-[nNpP] when patterns is a list
This patch allows `move-n` etc. to work when a textobject is defined
using a list with separate start and end patterns. Without this fix, an
error is generated when the keybind is pressed for moving between these
objects.
  • Loading branch information
Boolean263 committed Jan 19, 2020
commit 0df8dac0532e7e72a07c43480c1193a81e5a644e
29 changes: 23 additions & 6 deletions autoload/textobj/user.vim
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,10 @@ function! s:plugin.do_by_pattern(spec_name, obj_name, previous_mode)
endfunction

let s:PATTERN_IMPL_TABLE = {
\ 'move-n': 's:move_wrapper',
\ 'move-N': 's:move_wrapper',
\ 'move-p': 's:move_wrapper',
\ 'move-P': 's:move_wrapper',
\ 'move-n': 's:move_wrapper_start',
\ 'move-N': 's:move_wrapper_end',
\ 'move-p': 's:move_wrapper_start',
\ 'move-P': 's:move_wrapper_end',
\ 'select': 'textobj#user#select',
\ 'select-a': 's:select_pair_wrapper',
\ 'select-i': 's:select_pair_wrapper',
Expand All @@ -542,10 +542,27 @@ let s:PATTERN_FLAGS_TABLE = {
\ 'select-i': 'i',
\ }

function! s:move_wrapper(patterns, flags, previous_mode)
function! s:move_wrapper_start(patterns, flags, previous_mode)
" \x16 = CTRL-V
let pat = a:patterns
if type(pat) == type([])
let pat = pat[0]
endif
call textobj#user#move(
\ pat,
\ substitute(a:flags, '[vV\x16]', '', 'g'),
\ a:previous_mode
\ )
endfunction

function! s:move_wrapper_end(patterns, flags, previous_mode)
" \x16 = CTRL-V
let pat = a:patterns
if type(pat) == type([])
let pat = pat[1]
endif
call textobj#user#move(
\ a:patterns,
\ pat,
\ substitute(a:flags, '[vV\x16]', '', 'g'),
\ a:previous_mode
\ )
Expand Down