mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 19:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0040

Browse Source 
Problem:    Whole line highlighting with matchaddpos() does not work.
Solution:   Check for zero length. (Hirohito Higashi)

8507747600
This commit is contained in:
Michael Ennen
2016-12-06 22:56:14 -07:00
parent 0e99d29169
commit 63c46c1106
3 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/screen.c
View File

@@ -5698,6 +5698,8 @@ next_search_hl (
}
}
/// If there is a match fill "shl" and return one.
/// Return zero otherwise.
static int
next_search_hl_pos(
match_T *shl, // points to a match
@@ -5707,7 +5709,7 @@ next_search_hl_pos(
)
{
int i;
int bot = -1;
int found = -1;
shl->lnum = 0;
for (i = posmatch->cur; i < MAXPOSMATCH; i++) {
@@ -5716,41 +5718,41 @@ next_search_hl_pos(
if (pos->lnum == 0) {
break;
}
if (pos->col + pos->len - 1 <= mincol) {
if (pos->len == 0 && pos->col < mincol) {
continue;
}
if (pos->lnum == lnum) {
if (bot != -1) {
// partially sort positions by column numbers
// on the same line
if (pos->col < posmatch->pos[bot].col) {
if (found >= 0) {
// if this match comes before the one at "found" then swap
// them
if (pos->col < posmatch->pos[found].col) {
llpos_T tmp = *pos;
*pos = posmatch->pos[bot];
posmatch->pos[bot] = tmp;
*pos = posmatch->pos[found];
posmatch->pos[found] = tmp;
}
} else {
bot = i;
shl->lnum = lnum;
found = i;
}
}
}
posmatch->cur = 0;
if (bot != -1) {
colnr_T start = posmatch->pos[bot].col == 0
? 0: posmatch->pos[bot].col - 1;
colnr_T end = posmatch->pos[bot].col == 0
? MAXCOL : start + posmatch->pos[bot].len;
if (found >= 0) {
colnr_T start = posmatch->pos[found].col == 0
? 0: posmatch->pos[found].col - 1;
colnr_T end = posmatch->pos[found].col == 0
? MAXCOL : start + posmatch->pos[found].len;
shl->lnum = lnum;
shl->rm.startpos[0].lnum = 0;
shl->rm.startpos[0].col = start;
shl->rm.endpos[0].lnum = 0;
shl->rm.endpos[0].col = end;
shl->is_addpos = true;
posmatch->cur = bot + 1;
return true;
posmatch->cur = found + 1;
return 1;
}
return false;
return 0;
}
static void screen_start_highlight(int attr)