From: Bram Moolenaar Date: Sun, 12 Aug 2018 14:26:58 +0000 (+0200) Subject: patch 8.1.0276: no test for 'incsearch' highlighting with :s X-Git-Tag: v8.1.0276 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=164251ff805e89a3d9a850a77e3139e28908f44a;p=vim patch 8.1.0276: no test for 'incsearch' highlighting with :s Problem: No test for 'incsearch' highlighting with :s. Solution: Add a screendump test. --- diff --git a/src/testdir/dumps/Test_incsearch_substitute_01.dump b/src/testdir/dumps/Test_incsearch_substitute_01.dump new file mode 100644 index 000000000..63886f559 --- /dev/null +++ b/src/testdir/dumps/Test_incsearch_substitute_01.dump @@ -0,0 +1,9 @@ +|f+0&#ffffff0|o@1| |1| @64 +|f|o@1| |2| @64 +|f+1&&|o@1| +0&&|3| @64 +|f+0&#ffff4012|o@1| +0&#ffffff0|4| @64 +|f+0&#ffff4012|o@1| +0&#ffffff0|5| @64 +|f|o@1| |6| @64 +|f|o@1| |7| @64 +|f|o@1| |8| @64 +|:|.|,|.|+|2|s|/|f|o@1> @58 diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim index ac5b228df..20ffa0fbf 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -818,6 +818,41 @@ func Test_incsearch_substitute() call Incsearch_cleanup() endfunc +" Similar to Test_incsearch_substitute() but with a screendump halfway. +func Test_incsearch_substitute_dump() + if !exists('+incsearch') + return + endif + if !CanRunVimInTerminal() + return + endif + call writefile([ + \ 'set incsearch hlsearch scrolloff=0', + \ 'for n in range(1, 10)', + \ ' call setline(n, "foo " . n)', + \ 'endfor', + \ '3', + \ ], 'Xis_subst_script') + let buf = RunVimInTerminal('-S Xis_subst_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, ':.,.+2s/') + sleep 100m + call term_sendkeys(buf, 'f') + sleep 100m + call term_sendkeys(buf, 'o') + sleep 100m + call term_sendkeys(buf, 'o') + call VerifyScreenDump(buf, 'Test_incsearch_substitute_01', {}) + + call term_sendkeys(buf, "\") + call StopVimInTerminal(buf) + call delete('Xis_subst_script') +endfunc + func Test_search_undefined_behaviour() if !has("terminal") return diff --git a/src/version.c b/src/version.c index a8262a7ce..98b233588 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 276, /**/ 275, /**/