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)

diff --git a/src/search.c b/src/search.c
index aa16d448426e31a7b20ae6cc68422809cd84358f..920c68c5aae1e2cfd5bc1ff29e019afdc8aa4984 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2145,6 +2145,8 @@ findmatchlimit(
     else if (initc != '#' && initc != NUL)
     {
        find_mps_values(&initc, &findc, &backwards, TRUE);
+       if (dir)
+           backwards = (dir == FORWARD) ? FALSE : TRUE;
        if (findc == NUL)
            return NULL;
     }

diff --git a/src/testdir/test_textobjects.vim b/src/testdir/test_textobjects.vim
index c691c8be68960147a12a4896505cba46f940925e..088b5d2f5011fb828da42aac5de5190dcd995b96 100644 (file)
--- a/src/testdir/test_textobjects.vim
+++ b/src/testdir/test_textobjects.vim
@@ -564,4 +564,36 @@ func Test_textobj_quote()
   close!
 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

diff --git a/src/textobject.c b/src/textobject.c
index 2d5d5ddfbc00d29c9c3a026e38e9c62be070348d..e4a7db38ed42cdbc3b5444f9184048d29697dbc6 100644 (file)
--- a/src/textobject.c
+++ b/src/textobject.c
@@ -1079,12 +1079,25 @@ current_block(
      */
     save_cpo = p_cpo;
     p_cpo = (char_u *)(vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%");
-    while (count-- > 0)
+    if ((pos = findmatch(NULL, what)) != NULL)
     {
-       if ((pos = findmatch(NULL, what)) == NULL)
-           break;
-       curwin->w_cursor = *pos;
-       start_pos = *pos;   // the findmatch for end_pos will overwrite *pos
+       while (count-- > 0)
+       {
+           if ((pos = findmatch(NULL, what)) == NULL)
+               break;
+           curwin->w_cursor = *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;
 

diff --git a/src/version.c b/src/version.c
index c901996df642ee40ccf4057299ec117c196c7556..d8e07b156e71cb4ce0e7f9ee1b9264ff2ecd1102 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3255,
 /**/
     3254,
 /**/