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:8.2.4378: incsearch HL broken when calling searchcount in 'tabLine' (#19147)

Browse Source 
Problem:    Incsearch highlight broken when calling searchcount() in 'tabLine'
            function. (Mirko Palmer)
Solution:   Save and restore the incsearch state. (Christian Brabandt,
            closes vim/vim#9763, closes vim/vim#9633)
6dd7424c7e
This commit is contained in:
zeertzjq
2022-06-29 19:34:37 +08:00
committed by GitHub
parent bab32bba7a
commit 8ea09fc908
3 changed files with 124 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/search.c
View File

@@ -286,6 +286,8 @@ static struct spat saved_last_search_spat;
static int did_save_last_search_spat = 0;
static int saved_last_idx = 0;
static bool saved_no_hlsearch = false;
static colnr_T saved_search_match_endcol;
static linenr_T saved_search_match_lines;
/// Save and restore the search pattern for incremental highlight search
/// feature.
@@ -328,6 +330,21 @@ void restore_last_search_pattern(void)
set_no_hlsearch(saved_no_hlsearch);
}
/// Save and restore the incsearch highlighting variables.
/// This is required so that calling searchcount() at does not invalidate the
/// incsearch highlighting.
static void save_incsearch_state(void)
{
saved_search_match_endcol = search_match_endcol;
saved_search_match_lines = search_match_lines;
}
static void restore_incsearch_state(void)
{
search_match_endcol = saved_search_match_endcol;
search_match_lines = saved_search_match_lines;
}
char_u *last_search_pattern(void)
{
return spats[RE_SEARCH].pat;
@@ -4717,6 +4734,7 @@ void f_searchcount(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
save_last_search_pattern();
save_incsearch_state();
if (pattern != NULL) {
if (*pattern == NUL) {
goto the_end;
@@ -4738,6 +4756,7 @@ void f_searchcount(typval_T *argvars, typval_T *rettv, FunPtr fptr)
the_end:
restore_last_search_pattern();
restore_incsearch_state();
}
/// Fuzzy string matching