Mercurial > vim
changeset 30243:b57d52934160 v9.0.0457
patch 9.0.0457: substitute prompt does not highlight an empty match
Commit: https://github.com/vim/vim/commit/a04f457a6c071179bac4088c9314007d39d5c5e0
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 13 13:45:26 2022 +0100
patch 9.0.0457: substitute prompt does not highlight an empty match
Problem: Substitute prompt does not highlight an empty match.
Solution: Highlight at least one character.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 13 Sep 2022 15:00:05 +0200 |
| parents | d337dce9d479 |
| children | 30f106bef844 |
| files | src/ex_cmds.c src/testdir/dumps/Test_sub_highlight_zer_match_1.dump src/testdir/test_substitute.vim src/version.c |
| diffstat | 4 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -4308,6 +4308,10 @@ ex_substitute(exarg_T *eap) - regmatch.startpos[0].lnum; search_match_endcol = regmatch.endpos[0].col + len_change; + if (search_match_lines == 0 + && search_match_endcol == 0) + // highlight at least one character for /^/ + search_match_endcol = 1; highlight_match = TRUE; update_topline();
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_sub_highlight_zer_match_1.dump @@ -0,0 +1,8 @@ +|o+1&#ffffff0|n+0&&|e| @56 +|t|w|o| @56 +|t|h|r|e@1| @54 +|~+0#4040ff13&| @58 +|~| @58 +|~| @58 +|~| @58 +|r+0#00e0003&|e|p|l|a|c|e| |w|i|t|h| @1|.@2|/|a|/|q|/|l|/|^|E|/|^|Y|)|?> +0#0000000&@10|1|,|1| @10|A|l@1|
--- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -2,6 +2,7 @@ source shared.vim source check.vim +source screendump.vim func Test_multiline_subst() enew! @@ -684,6 +685,21 @@ func Test_sub_cmd_9() bw! endfunc +func Test_sub_highlight_zero_match() + CheckRunVimInTerminal + + let lines =<< trim END + call setline(1, ['one', 'two', 'three']) + END + call writefile(lines, 'XscriptSubHighlight', 'D') + let buf = RunVimInTerminal('-S XscriptSubHighlight', #{rows: 8, cols: 60}) + call term_sendkeys(buf, ":%s/^/ /c\<CR>") + call VerifyScreenDump(buf, 'Test_sub_highlight_zer_match_1', {}) + + call term_sendkeys(buf, "\<Esc>") + call StopVimInTerminal(buf) +endfunc + func Test_nocatch_sub_failure_handling() " normal error results in all replacements func Foo()