From 65985ac998713dfe0f0ff1dd49c5e3e8f17f4870 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 16 Sep 2018 17:08:04 +0200 Subject: patch 8.1.0399: 'hlsearch' highlight remains in other window Problem: 'hlsearch' highlight remains in other window after cancelling command. Solution: Redraw all windows. Also remove unnecessary delays. (closes #3437) --- .../dumps/Test_incsearch_substitute_11.dump | 9 ++++++++ .../dumps/Test_incsearch_substitute_12.dump | 9 ++++++++ .../dumps/Test_incsearch_substitute_13.dump | 9 ++++++++ src/testdir/test_search.vim | 26 ++++++++-------------- 4 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 src/testdir/dumps/Test_incsearch_substitute_11.dump create mode 100644 src/testdir/dumps/Test_incsearch_substitute_12.dump create mode 100644 src/testdir/dumps/Test_incsearch_substitute_13.dump (limited to 'src/testdir') diff --git a/src/testdir/dumps/Test_incsearch_substitute_11.dump b/src/testdir/dumps/Test_incsearch_substitute_11.dump new file mode 100644 index 0000000000..0ec409f01a --- /dev/null +++ b/src/testdir/dumps/Test_incsearch_substitute_11.dump @@ -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 diff --git a/src/testdir/dumps/Test_incsearch_substitute_12.dump b/src/testdir/dumps/Test_incsearch_substitute_12.dump new file mode 100644 index 0000000000..02b73355dc --- /dev/null +++ b/src/testdir/dumps/Test_incsearch_substitute_12.dump @@ -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 diff --git a/src/testdir/dumps/Test_incsearch_substitute_13.dump b/src/testdir/dumps/Test_incsearch_substitute_13.dump new file mode 100644 index 0000000000..be3abb7121 --- /dev/null +++ b/src/testdir/dumps/Test_incsearch_substitute_13.dump @@ -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 diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim index 56e0bf28eb..b05ed4271a 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -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, "\") sleep 100m call term_sendkeys(buf, '/\v') - sleep 100m call VerifyScreenDump(buf, 'Test_incsearch_search_02', {}) call term_sendkeys(buf, "\") @@ -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, "\") @@ -907,30 +904,25 @@ func Test_incsearch_substitute_dump() call term_sendkeys(buf, "/foo\") 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, "\") - sleep 100m call VerifyScreenDump(buf, 'Test_incsearch_substitute_03', {}) call term_sendkeys(buf, "\") " Reverse range is accepted call term_sendkeys(buf, ':5,2s/foo') - sleep 100m call VerifyScreenDump(buf, 'Test_incsearch_substitute_04', {}) call term_sendkeys(buf, "\") " 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, "\") " 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, "\") @@ -938,13 +930,11 @@ func Test_incsearch_substitute_dump() call term_sendkeys(buf, ":set cursorline\") 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, "\") " 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, "\") @@ -952,7 +942,6 @@ func Test_incsearch_substitute_dump() call term_sendkeys(buf, '3G4G') call term_sendkeys(buf, ":nohlsearch\") call term_sendkeys(buf, ':6,7s/\v') - sleep 100m call VerifyScreenDump(buf, 'Test_incsearch_substitute_09', {}) call term_sendkeys(buf, "\") @@ -965,6 +954,15 @@ func Test_incsearch_substitute_dump() call term_sendkeys(buf, "\") call VerifyScreenDump(buf, 'Test_incsearch_substitute_10', {}) + call term_sendkeys(buf, ":split\") + call term_sendkeys(buf, ":let @/ = 'xyz'\") + call term_sendkeys(buf, ":%s/.") + call VerifyScreenDump(buf, 'Test_incsearch_substitute_11', {}) + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_incsearch_substitute_12', {}) + call term_sendkeys(buf, "\") + 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, "\") @@ -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, "\") call term_sendkeys(buf, ':vimg /on/ *.txt') - sleep 100m call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_02', {}) call term_sendkeys(buf, "\") call term_sendkeys(buf, ':vimgrepadd "\") call term_sendkeys(buf, ':lv "tha') - sleep 100m call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_04', {}) call term_sendkeys(buf, "\") call term_sendkeys(buf, ':lvimgrepa "the" **/*.txt') - sleep 100m call VerifyScreenDump(buf, 'Test_incsearch_vimgrep_05', {}) call term_sendkeys(buf, "\") -- cgit v1.2.3