mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 17:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0174: 'cursorline' and 'wincolor' hl missing with conceal and wrap

Browse Source 
Problem:  'cursorline' and 'wincolor' highlight missing with concealed and
          wrapped lines.
Solution: Apply 'cursorline' and 'wincolor' highlight to boguscols.
          (zeertzjq)

Since 'cursorline' and 'wincolor' highlight apply after the end of the
line, it is more consistent to have them also apply to boguscols.

Assigning MAXCOL to values in ScreenCols[] make mouse click behave the
same with 'cursorline' and 'nocursorline', but such behavior may be
incorrect, as it puts the cursor on the next screen line.  That may be
fixed in a future PR.

closes: vim/vim#14192

21b0a3df8c
This commit is contained in:
zeertzjq
2024-03-14 06:23:10 +08:00
parent b17be231a6
commit 9599e5d28d
3 changed files with 126 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/drawline.c
View File

@@ -2851,6 +2851,19 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s
&& !wp->w_p_rl; // Not right-to-left.
int draw_col = wlv.col - wlv.boguscols;
// Apply 'cursorline' highlight.
if (wlv.boguscols != 0 && (wlv.line_attr_lowprio != 0 || wlv.line_attr != 0)) {
int attr = hl_combine_attr(wlv.line_attr_lowprio, wlv.line_attr);
while (draw_col < grid->cols) {
linebuf_char[wlv.off] = schar_from_char(' ');
linebuf_attr[wlv.off] = attr;
linebuf_vcol[wlv.off] = MAXCOL; // TODO(zeertzjq): this is wrong
wlv.off++;
draw_col++;
}
}
if (virt_line_offset >= 0) {
draw_virt_text_item(buf, virt_line_offset, kv_A(virt_lines, virt_line_index).line,
kHlModeReplace, grid->cols, 0);

62
test/functional/legacy/conceal_spec.lua
View File

@@ -433,6 +433,68 @@ describe('Conceal', function()
]])
end)
-- oldtest: Test_conceal_wrapped_cursorline_wincolor()
it('CursorLine highlight on wrapped lines', function()
local screen = Screen.new(40, 4)
screen:set_default_attr_ids({
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
[1] = { background = Screen.colors.Green }, -- CursorLine (low-priority)
[2] = { foreground = Screen.colors.Red }, -- CursorLine (high-priority)
})
screen:attach()
exec([[
call setline(1, 'one one one |hidden| one one one one one one one one')
syntax match test /|hidden|/ conceal
set conceallevel=2 concealcursor=n cursorline
normal! g$
hi! CursorLine guibg=Green
]])
screen:expect([[
{1:one one one one one one one on^e }|
{1: one one one }|
{0:~ }|
|
]])
command('hi! CursorLine guibg=NONE guifg=Red')
screen:expect([[
{2:one one one one one one one on^e }|
{2: one one one }|
{0:~ }|
|
]])
end)
-- oldtest: Test_conceal_wrapped_cursorline_wincolor_rightleft()
it('CursorLine highlight on wrapped lines with rightleft', function()
local screen = Screen.new(40, 4)
screen:set_default_attr_ids({
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
[1] = { background = Screen.colors.Green }, -- CursorLine (low-priority)
[2] = { foreground = Screen.colors.Red }, -- CursorLine (high-priority)
})
screen:attach()
exec([[
call setline(1, 'one one one |hidden| one one one one one one one one')
syntax match test /|hidden|/ conceal
set conceallevel=2 concealcursor=n cursorline rightleft
normal! g$
hi! CursorLine guibg=Green
]])
screen:expect([[
{1: ^eno eno eno eno eno eno eno eno}|
{1: eno eno eno }|
{0: ~}|
|
]])
command('hi! CursorLine guibg=NONE guifg=Red')
screen:expect([[
{2: ^eno eno eno eno eno eno eno eno}|
{2: eno eno eno }|
{0: ~}|
|
]])
end)
-- oldtest: Test_conceal_resize_term()
it('resize editor', function()
local screen = Screen.new(75, 6)

51
test/old/testdir/test_conceal.vim
View File

@@ -169,6 +169,57 @@ func Test_conceal_with_cursorcolumn()
call StopVimInTerminal(buf)
endfunc
" Check that 'cursorline' and 'wincolor' apply to the whole line in presence
" of wrapped lines containing concealed text.
func Test_conceal_wrapped_cursorline_wincolor()
CheckScreendump
let code =<< trim [CODE]
call setline(1, 'one one one |hidden| one one one one one one one one')
syntax match test /|hidden|/ conceal
set conceallevel=2 concealcursor=n cursorline
normal! g$
[CODE]
call writefile(code, 'XTest_conceal_cul_wcr', 'D')
let buf = RunVimInTerminal('-S XTest_conceal_cul_wcr', {'rows': 4, 'cols': 40})
call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_01', {})
call term_sendkeys(buf, ":set wincolor=ErrorMsg\n")
call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_02', {})
call term_sendkeys(buf, ":set nocursorline\n")
call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_03', {})
" clean up
call StopVimInTerminal(buf)
endfunc
" Same as Test_conceal_wrapped_cursorline_wincolor(), but with 'rightleft'.
func Test_conceal_wrapped_cursorline_wincolor_rightleft()
CheckScreendump
let code =<< trim [CODE]
call setline(1, 'one one one |hidden| one one one one one one one one')
syntax match test /|hidden|/ conceal
set conceallevel=2 concealcursor=n cursorline rightleft
normal! g$
[CODE]
call writefile(code, 'XTest_conceal_cul_wcr_rl', 'D')
let buf = RunVimInTerminal('-S XTest_conceal_cul_wcr_rl', {'rows': 4, 'cols': 40})
call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_rl_01', {})
call term_sendkeys(buf, ":set wincolor=ErrorMsg\n")
call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_rl_02', {})
call term_sendkeys(buf, ":set nocursorline\n")
call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_rl_03', {})
" clean up
call StopVimInTerminal(buf)
endfunc
func Test_conceal_resize_term()
CheckScreendump