1
0
forked from aniani/vim

patch 8.2.3255: ci" finds following string but ci< and others don't

Problem:    ci" finds following string but ci< and others don't.
Solution:   When not inside an object find the start. (Connor Lane Smit,
            closes #8670)
This commit is contained in:
Connor Lane Smith
2021-07-31 13:31:42 +02:00
committed by Bram Moolenaar
parent 28d8421bfb
commit b9115da4be
4 changed files with 54 additions and 5 deletions

View File

@@ -2145,6 +2145,8 @@ findmatchlimit(
else if (initc != '#' && initc != NUL) else if (initc != '#' && initc != NUL)
{ {
find_mps_values(&initc, &findc, &backwards, TRUE); find_mps_values(&initc, &findc, &backwards, TRUE);
if (dir)
backwards = (dir == FORWARD) ? FALSE : TRUE;
if (findc == NUL) if (findc == NUL)
return NULL; return NULL;
} }

View File

@@ -564,4 +564,36 @@ func Test_textobj_quote()
close! close!
endfunc endfunc
" Test for i(, i<, etc. when cursor is in front of a block
func Test_textobj_find_paren_forward()
new
" i< and a> when cursor is in front of a block
call setline(1, '#include <foo.h>')
normal 0yi<
call assert_equal('foo.h', @")
normal 0ya>
call assert_equal('<foo.h>', @")
" 2i(, 3i( in front of a block enters second/third nested '('
call setline(1, 'foo (bar (baz (quux)))')
normal 0yi)
call assert_equal('bar (baz (quux))', @")
normal 02yi)
call assert_equal('baz (quux)', @")
normal 03yi)
call assert_equal('quux', @")
" 3i( in front of a block doesn't enter third but un-nested '('
call setline(1, 'foo (bar (baz) (quux))')
normal 03di)
call assert_equal('foo (bar (baz) (quux))', getline(1))
normal 02di)
call assert_equal('foo (bar () (quux))', getline(1))
normal 0di)
call assert_equal('foo ()', getline(1))
close!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -1079,6 +1079,8 @@ current_block(
*/ */
save_cpo = p_cpo; save_cpo = p_cpo;
p_cpo = (char_u *)(vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%"); p_cpo = (char_u *)(vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%");
if ((pos = findmatch(NULL, what)) != NULL)
{
while (count-- > 0) while (count-- > 0)
{ {
if ((pos = findmatch(NULL, what)) == NULL) if ((pos = findmatch(NULL, what)) == NULL)
@@ -1086,6 +1088,17 @@ current_block(
curwin->w_cursor = *pos; curwin->w_cursor = *pos;
start_pos = *pos; // the findmatch for end_pos will overwrite *pos start_pos = *pos; // the findmatch for end_pos will overwrite *pos
} }
}
else
{
while (count-- > 0)
{
if ((pos = findmatchlimit(NULL, what, FM_FORWARD, 0)) == NULL)
break;
curwin->w_cursor = *pos;
start_pos = *pos; // the findmatch for end_pos will overwrite *pos
}
}
p_cpo = save_cpo; p_cpo = save_cpo;
/* /*

View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3255,
/**/ /**/
3254, 3254,
/**/ /**/