diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-07-17 11:23:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-17 11:23:54 +0800 |
| commit | 620f4bd9b7fc834f0a969cccabdf65cff59a62ee (patch) | |
| tree | 547c36e88506a251bab9c40472958be345ad09a4 /src | |
| parent | 4025c2aa5f788ba2772d8f0dd3f7add499333878 (diff) | |
| parent | e83949f96c59de706a175a017e6a080b838118d1 (diff) | |
| download | rneovim-620f4bd9b7fc834f0a969cccabdf65cff59a62ee.tar.gz rneovim-620f4bd9b7fc834f0a969cccabdf65cff59a62ee.tar.bz2 rneovim-620f4bd9b7fc834f0a969cccabdf65cff59a62ee.zip | |
Merge pull request #29759 from zeertzjq/vim-9.0.0228
vim-patch:9.0.{0228,0407,0414}
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/regexp.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 5a5ba9df07..bd9fbf00be 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -6254,15 +6254,20 @@ static bool regmatch(uint8_t *scan, const proftime_T *tm, int *timed_out) } break; - case RE_VCOL: - if (!re_num_cmp((unsigned)win_linetabsize(rex.reg_win == NULL ? curwin : rex.reg_win, - rex.reg_firstlnum + rex.lnum, - (char *)rex.line, - (colnr_T)(rex.input - rex.line)) + 1, - scan)) { + case RE_VCOL: { + win_T *wp = rex.reg_win == NULL ? curwin : rex.reg_win; + linenr_T lnum = REG_MULTI ? rex.reg_firstlnum + rex.lnum : 1; + if (REG_MULTI && (lnum <= 0 || lnum > wp->w_buffer->b_ml.ml_line_count)) { + lnum = 1; + } + int vcol = win_linetabsize(wp, lnum, (char *)rex.line, + (colnr_T)(rex.input - rex.line)); + if (!re_num_cmp((uint32_t)vcol + 1, scan)) { status = RA_NOMATCH; } break; + } + break; case BOW: // \<word; rex.input points to w if (c == NUL) { // Can't match at end of line @@ -15099,9 +15104,13 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm result = col > t->state->val * ts; } if (!result) { - int lts = win_linetabsize(wp, rex.reg_firstlnum + rex.lnum, (char *)rex.line, col); + linenr_T lnum = REG_MULTI ? rex.reg_firstlnum + rex.lnum : 1; + if (REG_MULTI && (lnum <= 0 || lnum > wp->w_buffer->b_ml.ml_line_count)) { + lnum = 1; + } + int vcol = win_linetabsize(wp, lnum, (char *)rex.line, col); assert(t->state->val >= 0); - result = nfa_re_num_cmp((uintmax_t)t->state->val, op, (uintmax_t)lts + 1); + result = nfa_re_num_cmp((uintmax_t)t->state->val, op, (uintmax_t)vcol + 1); } if (result) { add_here = true; |