mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 03:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0407: matchstr() does match column offset

Browse Source 
Problem:    matchstr() does match column offset. (Yasuhiro Matsumoto)
Solution:   Accept line number zero. (closes vim/vim#10938)

75a115e8d6

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2024-07-17 10:38:40 +08:00
parent dce615bc42
commit ccdbab7810
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/regexp.c
View File

@@ -6259,7 +6259,7 @@ static bool regmatch(uint8_t *scan, const proftime_T *tm, int *timed_out)
linenr_T lnum = rex.reg_firstlnum + rex.lnum; linenr_T lnum = rex.reg_firstlnum + rex.lnum;
int vcol = 0; int vcol = 0;
if (lnum > 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) { if (lnum >= 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) {
vcol = win_linetabsize(wp, lnum, (char *)rex.line, vcol = win_linetabsize(wp, lnum, (char *)rex.line,
(colnr_T)(rex.input - rex.line)); (colnr_T)(rex.input - rex.line));
} }
@@ -15108,7 +15108,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm
linenr_T lnum = rex.reg_firstlnum + rex.lnum; linenr_T lnum = rex.reg_firstlnum + rex.lnum;
int vcol = 0; int vcol = 0;
if (lnum > 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) { if (lnum >= 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) {
vcol = win_linetabsize(wp, lnum, (char *)rex.line, col); vcol = win_linetabsize(wp, lnum, (char *)rex.line, col);
} }
assert(t->state->val >= 0); assert(t->state->val >= 0);

13
test/old/testdir/test_regexp_latin.vim
View File

@@ -30,11 +30,13 @@ endfunc
func Test_equivalence_re1() func Test_equivalence_re1()
set re=1 set re=1
call s:equivalence_test() call s:equivalence_test()
set re=0
endfunc endfunc
func Test_equivalence_re2() func Test_equivalence_re2()
set re=2 set re=2
call s:equivalence_test() call s:equivalence_test()
set re=0
endfunc endfunc
func Test_recursive_substitute() func Test_recursive_substitute()
@@ -67,6 +69,7 @@ func Test_eow_with_optional()
let actual = matchlist('abc def', '\(abc\>\)\?\s*\(def\)') let actual = matchlist('abc def', '\(abc\>\)\?\s*\(def\)')
call assert_equal(expected, actual) call assert_equal(expected, actual)
endfor endfor
set re=0
endfunc endfunc
func Test_backref() func Test_backref()
@@ -1147,4 +1150,14 @@ endfunc
" prop_type_delete('name') " prop_type_delete('name')
" enddef " enddef
func Test_compare_column_matchstr()
enew
set re=1
call assert_equal('aaa', matchstr('aaaaaaaaaaaaaaaaaaaa', '.*\%<5v'))
set re=2
call assert_equal('aaa', matchstr('aaaaaaaaaaaaaaaaaaaa', '.*\%<5v'))
set re=0
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab