aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

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.
This commit is contained in:
Bram Moolenaar
2018-08-22 23:05:44 +02:00
parent 8e7218c459
commit 8b0d5ce881
4 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ex_getln.c
View File

@@ -285,6 +285,7 @@ do_incsearch_highlighting(int firstc, incsearch_state_T *is_state,
char_u *dummy;
exarg_T ea;
pos_T save_cursor;
int use_last_pat;
*skiplen = 0;
*patlen = ccline.cmdlen;
@@ -361,10 +362,25 @@ do_incsearch_highlighting(int firstc, incsearch_state_T *is_state,
delim = (delim_optional && vim_isIDc(*p)) ? ' ' : *p++;
end = skip_regexp(p, delim, p_magic, NULL);
if (end == p && *end != delim)
return FALSE;
// found a non-empty pattern or //
use_last_pat = end == p && *end == delim;
if (end == p && !use_last_pat)
return FALSE;
// Don't do 'hlsearch' highlighting if the pattern matches everything.
if (!use_last_pat)
{
char 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);
*patlen = (int)(end - p);
@@ -556,17 +572,6 @@ may_do_incsearch_highlighting(
else
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();
// May redraw the status line to show the cursor position.
if (p_ru && curwin->w_status_height > 0)