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

vim-patch:9.0.1092: search error message doesn't show used pattern (#21518)

Browse Source 
Problem:    Search error message doesn't show used pattern.
Solution:   Pass the actually used pattern to where the error message is
            given. (Rob Pilling, closes vim/vim#11742)

e86190e7c1

Co-authored-by: Rob Pilling <robpilling@gmail.com>
This commit is contained in:
zeertzjq
2022-12-24 07:55:03 +08:00
committed by GitHub
parent 3ea1524cf8
commit 3b9bd7bd43
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/search.c
View File

@@ -132,7 +132,8 @@ typedef struct SearchedFile {
/// @param regmatch return: pattern and ignore-case flag
///
/// @return FAIL if failed, OK otherwise.
int search_regcomp(char_u *pat, int pat_save, int pat_use, int options, regmmatch_T *regmatch)
int search_regcomp(char_u *pat, char_u **used_pat, int pat_save, int pat_use, int options,
regmmatch_T *regmatch)
{
int magic;
int i;
@@ -163,6 +164,10 @@ int search_regcomp(char_u *pat, int pat_save, int pat_use, int options, regmmatc
add_to_history(HIST_SEARCH, (char *)pat, true, NUL);
}
if (used_pat) {
*used_pat = pat;
}
if (mr_pattern_alloced) {
xfree(mr_pattern);
mr_pattern_alloced = false;
@@ -509,7 +514,7 @@ void last_pat_prog(regmmatch_T *regmatch)
return;
}
emsg_off++; // So it doesn't beep if bad expr
(void)search_regcomp((char_u *)"", 0, last_idx, SEARCH_KEEP, regmatch);
(void)search_regcomp((char_u *)"", NULL, 0, last_idx, SEARCH_KEEP, regmatch);
emsg_off--;
}
@@ -567,7 +572,7 @@ int searchit(win_T *win, buf_T *buf, pos_T *pos, pos_T *end_pos, Direction dir,
timed_out = &extra_arg->sa_timed_out;
}
if (search_regcomp(pat, RE_SEARCH, pat_use,
if (search_regcomp(pat, NULL, RE_SEARCH, pat_use,
(options & (SEARCH_HIS + SEARCH_KEEP)), &regmatch) == FAIL) {
if ((options & SEARCH_MSG) && !rc_did_emsg) {
semsg(_("E383: Invalid search string: %s"), mr_pattern);
@@ -2523,7 +2528,7 @@ static int is_zero_width(char_u *pattern, int move, pos_T *cur, Direction direct
pattern = (char_u *)spats[last_idx].pat;
}
if (search_regcomp(pattern, RE_SEARCH, RE_SEARCH,
if (search_regcomp(pattern, NULL, RE_SEARCH, RE_SEARCH,
SEARCH_KEEP, &regmatch) == FAIL) {
return -1;
}