IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0320: too much 'incsearch' highlight for pat matching everything

Browse Source 
Problem:    Too much 'incsearch' highlight for pattern matching everything.
Solution:   Add the skiplen to the command and remove the line range.
            (Christian Brabandt)  Check for empty pattern earlier.
8b0d5ce881
This commit is contained in:
Aufar Gilbran 2020-08-19 00:50:58 +08:00
parent 5f5d08a88e
commit 4770a2bac5
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/ex_getln.c
View File

@ -286,6 +286,7 @@ static bool do_incsearch_highlighting(int firstc, incsearch_state_T *s,
char_u *dummy; char_u *dummy;
exarg_T ea; exarg_T ea;
pos_T save_cursor; pos_T save_cursor;
bool use_last_pat;
*skiplen = 0; *skiplen = 0;
*patlen = ccline.cmdlen; *patlen = ccline.cmdlen;
@ -365,11 +366,25 @@ static bool do_incsearch_highlighting(int firstc, incsearch_state_T *s,
delim = (delim_optional && vim_isIDc(*p)) ? ' ' : *p++; delim = (delim_optional && vim_isIDc(*p)) ? ' ' : *p++;
end = skip_regexp(p, delim, p_magic, NULL); end = skip_regexp(p, delim, p_magic, NULL);
if (end == p && *end != delim) { use_last_pat = end == p && *end == delim;
if (end == p && !use_last_pat) {
return false; return false;
} }
// found a non-empty pattern or //
// Don't do 'hlsearch' highlighting if the pattern matches everything.
if (!use_last_pat) {
char_u c = *end;
int empty;
*end = NUL;
empty = empty_pattern(p);
*end = c;
if (empty) {
return false;
}
}
// found a non-empty pattern or //
*skiplen = (int)(p - ccline.cmdbuff); *skiplen = (int)(p - ccline.cmdbuff);
*patlen = (int)(end - p); *patlen = (int)(end - p);
@ -505,17 +520,6 @@ static void may_do_incsearch_highlighting(int firstc, long count,
end_pos = curwin->w_cursor; // shutup gcc 4 end_pos = curwin->w_cursor; // shutup gcc 4
} }
// Disable 'hlsearch' highlighting if the pattern matches
// everything. Avoids a flash when typing "foo\|".
if (!use_last_pat) {
next_char = ccline.cmdbuff[skiplen + patlen];
ccline.cmdbuff[skiplen + patlen] = NUL;
if (empty_pattern(ccline.cmdbuff)) {
set_no_hlsearch(true);
}
ccline.cmdbuff[skiplen + patlen] = next_char;
}
validate_cursor(); validate_cursor();
// May redraw the status line to show the cursor position. // May redraw the status line to show the cursor position.
if (p_ru && curwin->w_status_height > 0) { if (p_ru && curwin->w_status_height > 0) {

8
src/nvim/testdir/test_search.vim
View File

@ -688,6 +688,14 @@ func Test_incsearch_substitute_dump()
call VerifyScreenDump(buf, 'Test_incsearch_substitute_08', {}) call VerifyScreenDump(buf, 'Test_incsearch_substitute_08', {})
call term_sendkeys(buf, "\<Esc>") call term_sendkeys(buf, "\<Esc>")
" Only \v handled as empty pattern, does not move cursor
call term_sendkeys(buf, '3G4G')
call term_sendkeys(buf, ":nohlsearch\<CR>")
call term_sendkeys(buf, ':6,7s/\v')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_09', {})
call term_sendkeys(buf, "\<Esc>")
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call delete('Xis_subst_script') call delete('Xis_subst_script')
endfunc endfunc