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.0321: 'incsearch' regression: /\v highlights everything

Browse Source 
Problem:    'incsearch' regression: /\v highlights everything.
Solution:   Put back the empty_pattern() check.
4edfe2d2a2
This commit is contained in:
Aufar Gilbran 2020-08-19 00:51:08 +08:00
parent 4770a2bac5
commit f2743cfb65
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/ex_getln.c
View File

@ -519,6 +519,17 @@ static void may_do_incsearch_highlighting(int firstc, long count,
} 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.

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

@ -701,7 +701,7 @@ func Test_incsearch_substitute_dump()
endfunc
" Similar to Test_incsearch_substitute_dump() for :sort
func Test_incsearch_ssort_dump()
func Test_incsearch_sort_dump()
if !exists('+incsearch')
return
endif
@ -828,6 +828,41 @@ func Test_incsearch_scrolling()
call delete('Xscript')
endfunc
func Test_incsearch_search_dump()
if !exists('+incsearch')
return
endif
if !CanRunVimInTerminal()
return
endif
call writefile([
\ 'set incsearch hlsearch scrolloff=0',
\ 'for n in range(1, 8)',
\ ' call setline(n, "foo " . n)',
\ 'endfor',
\ '3',
\ ], 'Xis_search_script')
let buf = RunVimInTerminal('-S Xis_search_script', {'rows': 9, 'cols': 70})
" Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
" the 'ambiwidth' check.
sleep 100m
" Need to send one key at a time to force a redraw.
call term_sendkeys(buf, '/fo')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_search_01', {})
call term_sendkeys(buf, "\<Esc>")
sleep 100m
call term_sendkeys(buf, '/\v')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_search_02', {})
call term_sendkeys(buf, "\<Esc>")
call StopVimInTerminal(buf)
call delete('Xis_search_script')
endfunc
func Test_incsearch_substitute()
throw 'skipped: Nvim does not support test_override()'
if !exists('+incsearch')