Mercurial > vim
changeset 14532:58cc47fae12e v8.1.0279
patch 8.1.0279: 'incsearch' highlighting does not skip white space
commit https://github.com/vim/vim/commit/2b926fcb3c5d8bd09a219009336bbec7c66ae67e
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 13 11:07:57 2018 +0200
patch 8.1.0279: 'incsearch' highlighting does not skip white space
Problem: 'incsearch' highlighting does not skip white space.
Solution: Skip white space after the command. (issue https://github.com/vim/vim/issues/3321)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 13 Aug 2018 11:15:05 +0200 |
| parents | 6d1726a06a8b |
| children | 358090a18f5b |
| files | src/ex_getln.c src/testdir/dumps/Test_incsearch_substitute_05.dump src/testdir/test_search.vim src/version.c |
| diffstat | 4 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -293,11 +293,12 @@ do_incsearch_highlighting(int firstc, in // Skip over "substitute" to find the pattern separator. for (p = cmd; ASCII_ISALPHA(*p); ++p) ; - if (*p != NUL + if (*skipwhite(p) != NUL && (STRNCMP(cmd, "substitute", p - cmd) == 0 || STRNCMP(cmd, "global", p - cmd) == 0 || STRNCMP(cmd, "vglobal", p - cmd) == 0)) { + p = skipwhite(p); delim = *p++; end = skip_regexp(p, delim, p_magic, NULL); if (end > p || *end == delim)
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_incsearch_substitute_05.dump @@ -0,0 +1,9 @@ +|f+0&#ffffff0|o@1| |1| @64 +|f+1&&|o|o+0&&| |2| @64 +|f+0&#ffff4012|o|o+0&#ffffff0| |3| @64 +|f|o@1| |4| @64 +|f|o@1| |5| @64 +|f|o@1| |6| @64 +|f|o@1| |7| @64 +|f|o@1| |8| @64 +|:|2|,|3|s|u|b| @1|/|f|o> @57
--- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -868,8 +868,14 @@ func Test_incsearch_substitute_dump() 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>") + call StopVimInTerminal(buf) call delete('Xis_subst_script') endfunc