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

Merge pull request #14317 from chentau/extmark_sub

Browse Source 
extmark: correct extmark_splice call with substitute and inccommand when replacing with escaped backslashes
This commit is contained in:
Björn Linse
2021-04-10 18:14:42 +02:00
committed by GitHub
parent 1b030f889c 343ee2d254
commit 6435b46b48
2 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/regexp.c
View File

@@ -6665,6 +6665,10 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
int len = 0; /* init for GCC */
static char_u *eval_result = NULL;
// We need to keep track of how many backslashes we escape, so that the byte
// counts for `extmark_splice` are correct.
int num_escaped = 0;
// Be paranoid...
if ((source == NULL && expr == NULL) || dest == NULL) {
EMSG(_(e_null));
@@ -6840,6 +6844,7 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
// later. Used to insert a literal CR.
default:
if (backslash) {
num_escaped += 1;
if (copy) {
*dst = '\\';
}
@@ -6979,7 +6984,7 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
*dst = NUL;
exit:
return (int)((dst - dest) + 1);
return (int)((dst - dest) + 1 - num_escaped);
}