Mercurial > vim
changeset 24693:97789fcef0cf v8.2.2885
patch 8.2.2885: searching for %'> does not match linewise end of line
Commit: https://github.com/vim/vim/commit/872bee557e5f8ab0e4a523a6a845868a2801b17e
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 24 22:56:15 2021 +0200
patch 8.2.2885: searching for \%'> does not match linewise end of line
Problem: searching for \%'> does not match linewise end of line. (Tim Chase)
Solution: Match end of line if column is MAXCOL. (closes https://github.com/vim/vim/issues/8238)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 24 May 2021 23:00:03 +0200 |
| parents | 4e7b36f14e6e |
| children | 44426ac4b715 |
| files | src/regexp_bt.c src/regexp_nfa.c src/testdir/test_search.vim src/version.c |
| diffstat | 4 files changed, 54 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -3357,17 +3357,29 @@ regmatch( pos = getmark_buf(rex.reg_buf, mark, FALSE); if (pos == NULL // mark doesn't exist - || pos->lnum <= 0 // mark isn't set in reg_buf - || (pos->lnum == rex.lnum + rex.reg_firstlnum - ? (pos->col == (colnr_T)(rex.input - rex.line) + || pos->lnum <= 0) // mark isn't set in reg_buf + { + status = RA_NOMATCH; + } + else + { + colnr_T pos_col = pos->lnum == rex.lnum + rex.reg_firstlnum + && pos->col == MAXCOL + ? (colnr_T)STRLEN(reg_getline( + pos->lnum - rex.reg_firstlnum)) + : pos->col; + + if ((pos->lnum == rex.lnum + rex.reg_firstlnum + ? (pos_col == (colnr_T)(rex.input - rex.line) ? (cmp == '<' || cmp == '>') - : (pos->col < (colnr_T)(rex.input - rex.line) + : (pos_col < (colnr_T)(rex.input - rex.line) ? cmp != '>' : cmp != '<')) : (pos->lnum < rex.lnum + rex.reg_firstlnum ? cmp != '>' : cmp != '<'))) status = RA_NOMATCH; + } } break;
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -6806,22 +6806,30 @@ nfa_regmatch( { pos_T *pos = getmark_buf(rex.reg_buf, t->state->val, FALSE); - // Compare the mark position to the match position. - result = (pos != NULL // mark doesn't exist - && pos->lnum > 0 // mark isn't set in reg_buf - && (pos->lnum == rex.lnum + rex.reg_firstlnum - ? (pos->col == (colnr_T)(rex.input - rex.line) + // Compare the mark position to the match position, if the mark + // exists and mark is set in reg_buf. + if (pos != NULL && pos->lnum > 0) + { + colnr_T pos_col = pos->lnum == rex.lnum + rex.reg_firstlnum + && pos->col == MAXCOL + ? (colnr_T)STRLEN(reg_getline( + pos->lnum - rex.reg_firstlnum)) + : pos->col; + + result = (pos->lnum == rex.lnum + rex.reg_firstlnum + ? (pos_col == (colnr_T)(rex.input - rex.line) ? t->state->c == NFA_MARK - : (pos->col < (colnr_T)(rex.input - rex.line) + : (pos_col < (colnr_T)(rex.input - rex.line) ? t->state->c == NFA_MARK_GT : t->state->c == NFA_MARK_LT)) : (pos->lnum < rex.lnum + rex.reg_firstlnum ? t->state->c == NFA_MARK_GT - : t->state->c == NFA_MARK_LT))); - if (result) - { - add_here = TRUE; - add_state = t->state->out; + : t->state->c == NFA_MARK_LT)); + if (result) + { + add_here = TRUE; + add_state = t->state->out; + } } break; }
--- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1332,13 +1332,28 @@ func Test_look_behind() bwipe! endfunc +func Test_search_visual_area_linewise() + new + call setline(1, ['aa', 'bb', 'cc']) + exe "normal 2GV\<Esc>" + for engine in [1, 2] + exe 'set regexpengine=' .. engine + exe "normal gg/\\%'<\<CR>>" + call assert_equal([0, 2, 1, 0, 1], getcurpos(), 'engine ' .. engine) + exe "normal gg/\\%'>\<CR>" + call assert_equal([0, 2, 2, 0, 2], getcurpos(), 'engine ' .. engine) + endfor + + bwipe! + set regexpengine& +endfunc + func Test_search_sentence() new " this used to cause a crash - call assert_fails("/\\%')", 'E486:') - call assert_fails("/", 'E486:') /\%'( / + bwipe endfunc " Test that there is no crash when there is a last search pattern but no last