thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0399: 'hlsearch' highlight remains in other window

Browse Source 
Problem:    'hlsearch' highlight remains in other window after cancelling
            command.
Solution:   Redraw all windows. Also remove unnecessary delays. (closes #3437)
This commit is contained in:
Bram Moolenaar
2018-09-16 17:08:04 +02:00
parent 8f4499b816
commit 65985ac998
6 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ex_getln.c
View File

@@ -445,10 +445,9 @@ finish_incsearch_highlighting(
p_magic = is_state->magic_save;
validate_cursor(); /* needed for TAB */
redraw_all_later(SOME_VALID);
if (call_update_screen)
update_screen(SOME_VALID);
else
redraw_all_later(SOME_VALID);
}
}
@@ -589,8 +588,11 @@ may_do_incsearch_highlighting(
{
next_char = ccline.cmdbuff[skiplen + patlen];
ccline.cmdbuff[skiplen + patlen] = NUL;
if (empty_pattern(ccline.cmdbuff))
if (empty_pattern(ccline.cmdbuff) && !no_hlsearch)
{
redraw_all_later(SOME_VALID);
set_no_hlsearch(TRUE);
}
ccline.cmdbuff[skiplen + patlen] = next_char;
}

9
src/testdir/dumps/Test_incsearch_substitute_11.dump Normal file
View File

@@ -0,0 +1,9 @@
|f+1&#ffffff0|o+0&#ffff4012@1| |1| +0&#ffffff0@64
|f+0&#ffff4012|o@1| |2| +0&#ffffff0@64
|f+0&#ffff4012|o@1| |3| +0&#ffffff0@64
|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @38|1|,|1| @11|T|o|p
|f+0&#ffff4012|o@1| |1| +0&#ffffff0@64
|f+0&#ffff4012|o@1| |2| +0&#ffffff0@64
|f+0&#ffff4012|o@1| |3| +0&#ffffff0@64
|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @38|2|,|1| @11|T|o|p
|:+0&&|%|s|/|.> @64

9
src/testdir/dumps/Test_incsearch_substitute_12.dump Normal file
View File

@@ -0,0 +1,9 @@
|f+0&#ffffff0|o@1| |1| @64
|f|o@1| |2| @64
|f|o@1| |3| @64
|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @38|1|,|1| @11|T|o|p
|f+0&&|o@1| |1| @64
|f|o@1| |2| @64
|f|o@1| |3| @64
|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @38|2|,|1| @11|T|o|p
|:+0&&|%|s|/> @65

9
src/testdir/dumps/Test_incsearch_substitute_13.dump Normal file
View File

@@ -0,0 +1,9 @@
|f+0&#ffffff0|o@1| |1| @64
>f|o@1| |2| @64
|f|o@1| |3| @64
|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @38|2|,|1| @11|T|o|p
|f+0&&|o@1| |1| @64
|f|o@1| |2| @64
|f|o@1| |3| @64
|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @38|2|,|1| @11|T|o|p
| +0&&@69

26
src/testdir/test_search.vim
View File

@@ -834,13 +834,11 @@ func Test_incsearch_search_dump()
" 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>")
@@ -899,7 +897,6 @@ func Test_incsearch_substitute_dump()
call term_sendkeys(buf, 'o')
sleep 100m
call term_sendkeys(buf, 'o')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_01', {})
call term_sendkeys(buf, "\<Esc>")
@@ -907,30 +904,25 @@ func Test_incsearch_substitute_dump()
call term_sendkeys(buf, "/foo\<CR>")
sleep 100m
call term_sendkeys(buf, ':.,.+2s//')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_02', {})
" Deleting last slash should remove the match.
call term_sendkeys(buf, "\<BS>")
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_03', {})
call term_sendkeys(buf, "\<Esc>")
" Reverse range is accepted
call term_sendkeys(buf, ':5,2s/foo')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_04', {})
call term_sendkeys(buf, "\<Esc>")
" White space after the command is skipped
call term_sendkeys(buf, ':2,3sub /fo')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_05', {})
call term_sendkeys(buf, "\<Esc>")
" Command modifiers are skipped
call term_sendkeys(buf, ':above below browse botr confirm keepmar keepalt keeppat keepjum filter xxx hide lockm leftabove noau noswap rightbel sandbox silent silent! $tab top unsil vert verbose 4,5s/fo.')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_06', {})
call term_sendkeys(buf, "\<Esc>")
@@ -938,13 +930,11 @@ func Test_incsearch_substitute_dump()
call term_sendkeys(buf, ":set cursorline\<CR>")
call term_sendkeys(buf, 'G9G')
call term_sendkeys(buf, ':9,11s/bar')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_07', {})
call term_sendkeys(buf, "\<Esc>")
" Cursorline highlighting at cursor when no match
call term_sendkeys(buf, ':9,10s/bar')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_substitute_08', {})
call term_sendkeys(buf, "\<Esc>")
@@ -952,7 +942,6 @@ func Test_incsearch_substitute_dump()
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>")
@@ -965,6 +954,15 @@ func Test_incsearch_substitute_dump()
call term_sendkeys(buf, "\<Esc>")
call VerifyScreenDump(buf, 'Test_incsearch_substitute_10', {})
call term_sendkeys(buf, ":split\<CR>")
call term_sendkeys(buf, ":let @/ = 'xyz'\<CR>")
call term_sendkeys(buf, ":%s/.")
call VerifyScreenDump(buf, 'Test_incsearch_substitute_11', {})
call term_sendkeys(buf, "\<BS>")
call VerifyScreenDump(buf, 'Test_incsearch_substitute_12', {})
call term_sendkeys(buf, "\<Esc>")
call VerifyScreenDump(buf, 'Test_incsearch_substitute_13', {})
call StopVimInTerminal(buf)
call delete('Xis_subst_script')
endfunc
@@ -988,7 +986,6 @@ func Test_incsearch_sort_dump()
" Need to send one key at a time to force a redraw.
call term_sendkeys(buf, ':sort ni u /on')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_sort_01', {})
call term_sendkeys(buf, "\<Esc>")
@@ -1015,27 +1012,22 @@ func Test_incsearch_vimgrep_dump()
" Need to send one key at a time to force a redraw.
call term_sendkeys(buf, ':vimgrep on')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_01', {})
call term_sendkeys(buf, "\<Esc>")
call term_sendkeys(buf, ':vimg /on/ *.txt')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_02', {})
call term_sendkeys(buf, "\<Esc>")
call term_sendkeys(buf, ':vimgrepadd "\<on')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_03', {})
call term_sendkeys(buf, "\<Esc>")
call term_sendkeys(buf, ':lv "tha')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_04', {})
call term_sendkeys(buf, "\<Esc>")
call term_sendkeys(buf, ':lvimgrepa "the" **/*.txt')
sleep 100m
call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_05', {})
call term_sendkeys(buf, "\<Esc>")

2
src/version.c
View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
399,
/**/
398,
/**/