Skip to content

Commit 60d0871

Browse files
committed
patch 8.1.0278: 'incsearch' highlighting does not accept reverse range
Problem: 'incsearch' highlighting does not accept reverse range. Solution: Swap the range when needed. (issue #3321)
1 parent c7f08b7 commit 60d0871

4 files changed

Lines changed: 28 additions & 2 deletions

File tree

src/ex_getln.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,17 @@ do_incsearch_highlighting(int firstc, incsearch_state_T *is_state,
320320
parse_cmd_address(&ea, &dummy);
321321
if (ea.addr_count > 0)
322322
{
323-
search_first_line = ea.line1;
324-
search_last_line = ea.line2;
323+
// Allow for reverse match.
324+
if (ea.line2 < ea.line1)
325+
{
326+
search_first_line = ea.line2;
327+
search_last_line = ea.line1;
328+
}
329+
else
330+
{
331+
search_first_line = ea.line1;
332+
search_last_line = ea.line2;
333+
}
325334
}
326335
else if (*cmd == 's')
327336
{
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
|f+0&#ffffff0|o@1| |1| @64
2+
|f+1&&|o@1| +0&&|2| @64
3+
|f+0&#ffff4012|o@1| +0&#ffffff0|3| @64
4+
|f+0&#ffff4012|o@1| +0&#ffffff0|4| @64
5+
|f+0&#ffff4012|o@1| +0&#ffffff0|5| @64
6+
|f|o@1| |6| @64
7+
|f|o@1| |7| @64
8+
|f|o@1| |8| @64
9+
|:|5|,|2|s|/|f|o@1> @60

src/testdir/test_search.vim

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,12 @@ func Test_incsearch_substitute_dump()
862862
call term_sendkeys(buf, "\<BS>")
863863
sleep 100m
864864
call VerifyScreenDump(buf, 'Test_incsearch_substitute_03', {})
865+
call term_sendkeys(buf, "\<Esc>")
866+
867+
" Reverse range is accepted
868+
call term_sendkeys(buf, ':5,2s/foo')
869+
sleep 100m
870+
call VerifyScreenDump(buf, 'Test_incsearch_substitute_04', {})
865871

866872
call term_sendkeys(buf, "\<Esc>")
867873
call StopVimInTerminal(buf)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,8 @@ static char *(features[]) =
794794

795795
static int included_patches[] =
796796
{ /* Add new patch number below this line */
797+
/**/
798+
278,
797799
/**/
798800
277,
799801
/**/

0 commit comments

Comments
 (0)