mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-14 13:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3110: a pattern that matches the cursor position is complicated

Browse Source 
Problem:    A pattern that matches the cursor position is bit complicated.
Solution:   Use a dot to indicate the cursor line and column. (Christian
            Brabandt, closes vim/vim#8497, closes vim/vim#8179)
04db26b360

Also use `n = ++vcol` in regexp_bt.c as `++vcol` alone fails lint.
This commit is contained in:
zeertzjq
2022-03-19 16:42:24 +08:00
parent e5428d10b5
commit 1bbe8ec282
5 changed files with 168 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/regexp_bt.c
View File

@@ -1578,14 +1578,19 @@ static char_u *regatom(int *flagp)
}
default:
if (ascii_isdigit(c) || c == '<' || c == '>'
|| c == '\'') {
if (ascii_isdigit(c) || c == '<' || c == '>' || c == '\'' || c == '.') {
uint32_t n = 0;
int cmp;
bool cur = false;
cmp = c;
if (cmp == '<' || cmp == '>')
if (cmp == '<' || cmp == '>') {
c = getchr();
}
if (no_Magic(c) == '.') {
cur = true;
c = getchr();
}
while (ascii_isdigit(c)) {
n = n * 10 + (uint32_t)(c - '0');
c = getchr();
@@ -1602,14 +1607,31 @@ static char_u *regatom(int *flagp)
}
break;
} else if (c == 'l' || c == 'c' || c == 'v') {
if (cur && n) {
semsg(_(e_regexp_number_after_dot_pos_search), no_Magic(c));
rc_did_emsg = true;
return NULL;
}
if (c == 'l') {
if (cur) {
n = curwin->w_cursor.lnum;
}
ret = regnode(RE_LNUM);
if (save_prev_at_start) {
at_start = true;
}
} else if (c == 'c') {
if (cur) {
n = curwin->w_cursor.col;
n++;
}
ret = regnode(RE_COL);
} else {
if (cur) {
colnr_T vcol = 0;
getvvcol(curwin, &curwin->w_cursor, NULL, NULL, &vcol);
n = ++vcol;
}
ret = regnode(RE_VCOL);
}
if (ret == JUST_CALC_SIZE) {