mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 03:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.2269

Browse Source 
Problem:    Using 'hlsearch' highlighting instead of matchpos if there is no
            search match.
Solution:   Pass NULL as last item to next_search_hl() when searching for
            'hlsearch' match. (Shane Harper, closes vim/vim#1013)

e17bdffff7
This commit is contained in:
Michael Ennen
2016-12-06 17:15:49 -07:00
parent 0064e9738a
commit c5d2e442a3
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/screen.c
View File

@@ -2597,7 +2597,8 @@ win_line (
if (cur != NULL) { if (cur != NULL) {
cur->pos.cur = 0; cur->pos.cur = 0;
} }
next_search_hl(wp, shl, lnum, (colnr_T)v, cur); next_search_hl(wp, shl, lnum, (colnr_T)v,
shl == &search_hl ? NULL : cur);
// Need to get the line again, a multi-line regexp may have made it // Need to get the line again, a multi-line regexp may have made it
// invalid. // invalid.
@@ -2926,7 +2927,8 @@ win_line (
shl->attr_cur = 0; shl->attr_cur = 0;
prev_syntax_id = 0; prev_syntax_id = 0;
next_search_hl(wp, shl, lnum, (colnr_T)v, cur); next_search_hl(wp, shl, lnum, (colnr_T)v,
shl == &search_hl ? NULL : cur);
pos_inprogress = !(cur == NULL || cur->pos.cur == 0); pos_inprogress = !(cur == NULL || cur->pos.cur == 0);
/* Need to get the line again, a multi-line regexp /* Need to get the line again, a multi-line regexp
@@ -5562,7 +5564,8 @@ static void prepare_search_hl(win_T *wp, linenr_T lnum)
n = 0; n = 0;
while (shl->first_lnum < lnum && (shl->rm.regprog != NULL while (shl->first_lnum < lnum && (shl->rm.regprog != NULL
|| (cur != NULL && pos_inprogress))) { || (cur != NULL && pos_inprogress))) {
next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, cur); next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n,
shl == &search_hl ? NULL : cur);
pos_inprogress = !(cur == NULL || cur->pos.cur == 0); pos_inprogress = !(cur == NULL || cur->pos.cur == 0);
if (shl->lnum != 0) { if (shl->lnum != 0) {
shl->first_lnum = shl->lnum shl->first_lnum = shl->lnum

27
src/nvim/testdir/test_match.vim
View File

@@ -186,4 +186,31 @@ func Test_matchaddpos()
set hlsearch& set hlsearch&
endfunc endfunc
func Test_matchaddpos_using_negative_priority()
set hlsearch
call clearmatches()
call setline(1, 'x')
let @/='x'
redraw!
let search_attr = screenattr(1,1)
let @/=''
call matchaddpos('Error', [1], 10)
redraw!
let error_attr = screenattr(1,1)
call setline(2, '-1 match priority')
call matchaddpos('Error', [2], -1)
redraw!
let negative_match_priority_attr = screenattr(2,1)
call assert_notequal(negative_match_priority_attr, search_attr, "Match with negative priority is incorrectly highlighted with Search highlight.")
call assert_equal(negative_match_priority_attr, error_attr)
nohl
set hlsearch&
endfunc
" vim: et ts=2 sw=2 " vim: et ts=2 sw=2