Permalink
Browse files

patch 8.0.0033

Problem:    Cannot use overlapping positions with matchaddpos().
Solution:   Check end of match. (Ozaki Kiichi) Add a test (Hirohito Higashi)
  • Loading branch information...
1 parent 4575876 commit a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a @brammool brammool committed Oct 15, 2016
Showing with 20 additions and 6 deletions.
  1. +8 −6 src/screen.c
  2. +10 −0 src/testdir/test_match.vim
  3. +2 −0 src/version.c
View
@@ -7786,21 +7786,23 @@ next_search_hl_pos(
shl->lnum = 0;
for (i = posmatch->cur; i < MAXPOSMATCH; i++)
{
- if (posmatch->pos[i].lnum == 0)
+ llpos_T *pos = &posmatch->pos[i];
+
+ if (pos->lnum == 0)
break;
- if (posmatch->pos[i].col < mincol)
+ if (pos->col + pos->len - 1 <= mincol)
continue;
- if (posmatch->pos[i].lnum == lnum)
+ if (pos->lnum == lnum)
{
if (shl->lnum == lnum)
{
/* partially sort positions by column numbers
* on the same line */
- if (posmatch->pos[i].col < posmatch->pos[bot].col)
+ if (pos->col < posmatch->pos[bot].col)
{
- llpos_T tmp = posmatch->pos[i];
+ llpos_T tmp = *pos;
- posmatch->pos[i] = posmatch->pos[bot];
+ *pos = posmatch->pos[bot];
posmatch->pos[bot] = tmp;
}
}
@@ -181,6 +181,16 @@ func Test_matchaddpos()
redraw!
call assert_equal(screenattr(2,2), screenattr(1,6))
+ " Check overlapping pos
+ call clearmatches()
+ call setline(1, ['1234567890', 'NH'])
+ call matchaddpos('Error', [[1,1,5], [1,3,5], [2,2]])
+ redraw!
+ call assert_notequal(screenattr(2,2), 0)
+ call assert_equal(screenattr(2,2), screenattr(1,5))
+ call assert_equal(screenattr(2,2), screenattr(1,7))
+ call assert_notequal(screenattr(2,2), screenattr(1,8))
+
nohl
syntax off
set hlsearch&
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 33,
+/**/
32,
/**/
31,

0 comments on commit a6c27ee

Please sign in to comment.