Mercurial > vim
changeset 25437:d4a710f06f02 v8.2.3255
patch 8.2.3255: ci" finds following string but ci< and others don't
Commit: https://github.com/vim/vim/commit/b9115da4bec5e6cfff69da85cc47c42dd67e42e4
Author: Connor Lane Smith <cls@lubutu.com>
Date: Sat Jul 31 13:31:42 2021 +0200
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 31 Jul 2021 13:45:03 +0200 |
| parents | 1c4eb97d71a1 |
| children | dfbaaeabc580 |
| files | src/search.c src/testdir/test_textobjects.vim src/textobject.c src/version.c |
| diffstat | 4 files changed, 54 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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
--- 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;