mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-22 15:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.2.0028: matchadd() conceal may use unrelated syntax cchar (#37974)

Browse Source 
Problem:  matchadd() conceal may use unrelated syntax cchar.
Solution: Only use syntax cchar when syntax_flags has HL_CONCEAL
          (zeertzjq).

closes: vim/vim#19459

d01f234ec1
(cherry picked from commit 785ac9f228)
This commit is contained in:
zeertzjq
2026-02-20 06:51:31 +08:00
committed by github-actions[bot]
parent 5655de0926
commit de20500b40
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/drawline.c
View File

@@ -2542,10 +2542,11 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, b
&& (wp != curwin || lnum != wp->w_cursor.lnum || conceal_cursor_line(wp)) && (wp != curwin || lnum != wp->w_cursor.lnum || conceal_cursor_line(wp))
&& ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0 || decor_conceal > 0) && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0 || decor_conceal > 0)
&& !(lnum_in_visual_area && vim_strchr(wp->w_p_cocu, 'v') == NULL)) { && !(lnum_in_visual_area && vim_strchr(wp->w_p_cocu, 'v') == NULL)) {
bool syntax_conceal = (syntax_flags & HL_CONCEAL) != 0;
wlv.char_attr = conceal_attr; wlv.char_attr = conceal_attr;
if (((prev_syntax_id != syntax_seqnr && (syntax_flags & HL_CONCEAL) != 0) if (((prev_syntax_id != syntax_seqnr && syntax_conceal)
|| has_match_conc > 1 || decor_conceal > 1) || has_match_conc > 1 || decor_conceal > 1)
&& (syn_get_sub_char() != NUL && ((syntax_conceal && syn_get_sub_char() != NUL)
|| (has_match_conc && match_conc) || (has_match_conc && match_conc)
|| (decor_conceal && decor_state.conceal_char) || (decor_conceal && decor_state.conceal_char)
|| wp->w_p_cole == 1) || wp->w_p_cole == 1)
@@ -2565,7 +2566,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, b
if (decor_state.conceal_attr) { if (decor_state.conceal_attr) {
wlv.char_attr = decor_state.conceal_attr; wlv.char_attr = decor_state.conceal_attr;
} }
} else if (syn_get_sub_char() != NUL) { } else if (syntax_conceal && syn_get_sub_char() != NUL) {
mb_schar = schar_from_char(syn_get_sub_char()); mb_schar = schar_from_char(syn_get_sub_char());
} else if (wp->w_p_lcs_chars.conceal != NUL) { } else if (wp->w_p_lcs_chars.conceal != NUL) {
mb_schar = wp->w_p_lcs_chars.conceal; mb_schar = wp->w_p_lcs_chars.conceal;

23
test/old/testdir/test_matchadd_conceal.vim
View File

@@ -203,6 +203,29 @@ func Test_syn_and_match_conceal()
call assert_equal(screenattr(lnum, 2), screenattr(lnum, 18)) call assert_equal(screenattr(lnum, 2), screenattr(lnum, 18))
call assert_notequal(screenattr(lnum, 18), screenattr(lnum, 19)) call assert_notequal(screenattr(lnum, 18), screenattr(lnum, 19))
5new | setlocal conceallevel=2 concealcursor=n
redraw!
call assert_equal(expect, Screenline(6 + lnum))
" Syntax conceal shouldn't interfere with matchadd() in another buffer.
call setline(1, 'foo bar baz')
call matchadd('Conceal', 'bar')
redraw!
call assert_equal('foo baz', Screenline(1))
call assert_equal(expect, Screenline(6 + lnum))
" Syntax conceal shouldn't interfere with matchadd() in the same buffer.
syntax match MyOtherConceal /foo/ conceal cchar=!
redraw!
call assert_equal('! baz', Screenline(1))
call assert_equal(expect, Screenline(6 + lnum))
syntax clear
redraw!
call assert_equal('foo baz', Screenline(1))
call assert_equal(expect, Screenline(6 + lnum))
bwipe!
" 123456789012345678 " 123456789012345678
let expect = '# ThisXis a Test' let expect = '# ThisXis a Test'
syntax clear MyConceal syntax clear MyConceal