thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.4805: CurSearch used for all matches in current line

Browse Source 
Problem:    CurSearch used for all matches in current line.
Solution:   Don't use the non-zero line count. (closes #10247)
This commit is contained in:
Bram Moolenaar
2022-04-22 20:07:21 +01:00
parent 1fc6ea9bf3
commit 9b36750640
7 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/match.c
View File

@@ -617,6 +617,26 @@ prepare_search_hl(win_T *wp, match_T *search_hl, linenr_T lnum)
}
}
/*
* Update "shl->has_cursor" based on the match in "shl" and the cursor
* position.
*/
static void
check_cur_search_hl(win_T *wp, match_T *shl)
{
long linecount = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
if (wp->w_cursor.lnum >= shl->lnum
&& wp->w_cursor.lnum <= shl->lnum + shl->rm.endpos[0].lnum
&& (wp->w_cursor.lnum > shl->lnum
|| wp->w_cursor.col >= shl->rm.startpos[0].col)
&& (wp->w_cursor.lnum < shl->lnum + linecount
|| wp->w_cursor.col < shl->rm.endpos[0].col))
shl->has_cursor = TRUE;
else
shl->has_cursor = FALSE;
}
/*
* Prepare for 'hlsearch' and match highlighting in one window line.
* Return TRUE if there is such highlighting and set "search_attr" to the
@@ -677,20 +697,13 @@ prepare_search_hl_line(
shl->endcol = shl->rm.endpos[0].col;
else
shl->endcol = MAXCOL;
if (shl->rm.endpos[0].lnum != shl->rm.startpos[0].lnum)
shl->lines = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
else
shl->lines = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
if (shl->lines == 0)
shl->lines = 1;
// check if the cursor is in the match before changing the columns
if (wp->w_cursor.lnum >= shl->lnum
&& wp->w_cursor.lnum
<= shl->lnum + shl->rm.endpos[0].lnum
&& (wp->w_cursor.lnum > shl->lnum
|| wp->w_cursor.col >= shl->rm.startpos[0].col)
&& (wp->w_cursor.lnum < shl->lnum + shl->lines
|| wp->w_cursor.col < shl->rm.endpos[0].col))
shl->has_cursor = TRUE;
if (shl == search_hl)
check_cur_search_hl(wp, shl);
// Highlight one character for an empty match.
if (shl->startcol == shl->endcol)
@@ -811,6 +824,10 @@ update_search_hl(
else
shl->endcol = MAXCOL;
// check if the cursor is in the match
if (shl == search_hl)
check_cur_search_hl(wp, shl);
if (shl->startcol == shl->endcol)
{
// highlight empty match, try again after