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

vim-patch:8.0.0049

Browse Source 
Problem:    When a match ends in part of concealed text highlighting, it might
            mess up concealing by resetting prev_syntax_id.
Solution:   Do not reset prev_syntax_id and add a test to verify. (Christian
            Brabandt, closes vim/vim#1092)

2f97912800
This commit is contained in:
Justin M. Keyes
2017-03-21 13:26:02 +01:00
parent 5ee211770d
commit cd9fc4627e
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/screen.c
View File

@@ -2922,7 +2922,6 @@ win_line (
} }
} else if (v == (long)shl->endcol) { } else if (v == (long)shl->endcol) {
shl->attr_cur = 0; shl->attr_cur = 0;
prev_syntax_id = 0;
next_search_hl(wp, shl, lnum, (colnr_T)v, next_search_hl(wp, shl, lnum, (colnr_T)v,
shl == &search_hl ? NULL : cur); shl == &search_hl ? NULL : cur);

22
src/nvim/testdir/test_matchadd_conceal.vim
View File

@@ -260,3 +260,25 @@ function! Test_matchadd_repeat_conceal_with_syntax_off()
quit! quit!
endfunction endfunction
function! Test_matchadd_and_syn_conceal()
new
let cnt='Inductive bool : Type := | true : bool | false : bool.'
let expect = 'Inductive - : Type := | true : - | false : -.'
0put =cnt
" set filetype and :syntax on to change screenattr()
set cole=1 cocu=nv
hi link CheckedByCoq WarningMsg
syntax on
syntax keyword coqKwd bool conceal cchar=-
redraw!
call assert_equal(expect, s:screenline(1))
call assert_notequal(screenattr(1, 10) , screenattr(1, 11))
call assert_notequal(screenattr(1, 11) , screenattr(1, 12))
call assert_equal(screenattr(1, 11) , screenattr(1, 32))
call matchadd('CheckedByCoq', '\%<2l\%>9c\%<16c')
call assert_equal(expect, s:screenline(1))
call assert_notequal(screenattr(1, 10) , screenattr(1, 11))
call assert_notequal(screenattr(1, 11) , screenattr(1, 12))
call assert_equal(screenattr(1, 11) , screenattr(1, 32))
endfunction