IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18490 from zeertzjq/vim-8.2.4918

Browse Source 
vim-patch:8.2.{4918,4923}: conceal character from matchadd() displayed too many times
This commit is contained in:
zeertzjq 2022-05-09 18:39:32 +08:00 committed by GitHub
commit 41ce7b07e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/screen.c
View File

@ -3666,13 +3666,12 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
}
if (wp->w_p_cole > 0
&& (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)
&& !(lnum_in_visual_area
&& vim_strchr(wp->w_p_cocu, 'v') == NULL)) {
&& !(lnum_in_visual_area && vim_strchr(wp->w_p_cocu, 'v') == NULL)) {
char_attr = conceal_attr;
if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1 || decor_conceal > 1)
if (((prev_syntax_id != syntax_seqnr && (syntax_flags & HL_CONCEAL) != 0)
|| has_match_conc > 1 || decor_conceal > 1)
&& (syn_get_sub_char() != NUL
|| (has_match_conc && match_conc)
|| (decor_conceal && decor_state.conceal_char)

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

@ -335,6 +335,25 @@ func Test_matchadd_and_syn_conceal()
call assert_equal(screenattr(1, 11) , screenattr(1, 32))
endfunc
func Test_interaction_matchadd_syntax()
new
" Test for issue #7268 fix.
" When redrawing the second column, win_line() was comparing the sequence
" number of the syntax-concealed region with a bogus zero value that was
" returned for the matchadd-concealed region. Before 8.0.0672 the sequence
" number was never reset, thus masking the problem.
call setline(1, 'aaa|bbb|ccc')
call matchadd('Conceal', '^..', 10, -1, #{conceal: 'X'})
syn match foobar '^.'
setl concealcursor=n conceallevel=1
redraw!
call assert_equal('Xa|bbb|ccc', Screenline(1))
call assert_notequal(screenattr(1, 1), screenattr(1, 2))
bwipe!
endfunc
func Test_cursor_column_in_concealed_line_after_window_scroll()
CheckRunVimInTerminal