mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.3940: match highlight disappears when doing incsearch for ":s/pat"
Problem: Match highlight disappears when doing incsearch for ":s/pat". Solution: Only use line limit for incsearch highlighting. (closes #9425)
This commit is contained in:
parent
5a664fe57f
commit
94fb8274ca
@ -427,7 +427,7 @@ next_search_hl(
|
||||
int called_emsg_before = called_emsg;
|
||||
|
||||
// for :{range}s/pat only highlight inside the range
|
||||
if (lnum < search_first_line || lnum > search_last_line)
|
||||
if ((lnum < search_first_line || lnum > search_last_line) && cur == NULL)
|
||||
{
|
||||
shl->lnum = 0;
|
||||
return;
|
||||
|
6
src/testdir/dumps/Test_match_with_incsearch_1.dump
Normal file
6
src/testdir/dumps/Test_match_with_incsearch_1.dump
Normal file
@ -0,0 +1,6 @@
|
||||
>0+0&#ffffff0| @73
|
||||
|1| @73
|
||||
|2+0#ffffff16#e000002| +0#0000000#ffffff0@73
|
||||
|3| @73
|
||||
|4| @73
|
||||
@57|1|,|1| @10|T|o|p|
|
6
src/testdir/dumps/Test_match_with_incsearch_2.dump
Normal file
6
src/testdir/dumps/Test_match_with_incsearch_2.dump
Normal file
@ -0,0 +1,6 @@
|
||||
|0+1&#ffffff0| +0&&@73
|
||||
|1| @73
|
||||
|2+0#ffffff16#e000002| +0#0000000#ffffff0@73
|
||||
|3| @73
|
||||
|4| @73
|
||||
|:|s|/|0> @70
|
@ -366,6 +366,27 @@ func Test_match_in_linebreak()
|
||||
call delete('XscriptMatchLinebreak')
|
||||
endfunc
|
||||
|
||||
func Test_match_with_incsearch()
|
||||
CheckRunVimInTerminal
|
||||
|
||||
let lines =<< trim END
|
||||
set incsearch
|
||||
call setline(1, range(20))
|
||||
call matchaddpos('ErrorMsg', [3])
|
||||
END
|
||||
call writefile(lines, 'XmatchWithIncsearch')
|
||||
let buf = RunVimInTerminal('-S XmatchWithIncsearch', #{rows: 6})
|
||||
call TermWait(buf)
|
||||
call VerifyScreenDump(buf, 'Test_match_with_incsearch_1', {})
|
||||
|
||||
call term_sendkeys(buf, ":s/0")
|
||||
call VerifyScreenDump(buf, 'Test_match_with_incsearch_2', {})
|
||||
|
||||
call term_sendkeys(buf, "\<CR>")
|
||||
call StopVimInTerminal(buf)
|
||||
call delete('XmatchWithIncsearch')
|
||||
endfunc
|
||||
|
||||
" Test for deleting matches outside of the screen redraw top/bottom lines
|
||||
" This should cause a redraw of those lines.
|
||||
func Test_matchdelete_redraw()
|
||||
|
@ -749,6 +749,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3940,
|
||||
/**/
|
||||
3939,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user