mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-29 18:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(folds): combined Folded and Visual highlights (#23752)

Browse Source 
Also combine high-priority CursorLine with Folded.
This commit is contained in:
zeertzjq
2023-05-25 22:14:12 +08:00
committed by GitHub
parent aa9d46b672
commit ee986ee044
4 changed files with 129 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/functional/ui/decorations_spec.lua
View File

@@ -10,6 +10,7 @@ local expect_events = helpers.expect_events
local meths = helpers.meths
local curbufmeths = helpers.curbufmeths
local command = helpers.command
local assert_alive = helpers.assert_alive
describe('decorations providers', function()
local screen
@@ -80,7 +81,7 @@ describe('decorations providers', function()
local ns2 = api.nvim_create_namespace "ns2"
api.nvim_set_decoration_provider(ns2, {})
]])
helpers.assert_alive()
assert_alive()
end)
it('leave a trace', function()
@@ -1092,7 +1093,7 @@ describe('extmark decorations', function()
{1:~ }|
|
]]}
helpers.assert_alive()
assert_alive()
end)
it('conceal #19007', function()
@@ -1258,6 +1259,9 @@ describe('decorations: inline virtual text', function()
[13] = {reverse = true};
[14] = {foreground = Screen.colors.SlateBlue, background = Screen.colors.LightMagenta};
[15] = {bold = true, reverse = true};
[16] = {foreground = Screen.colors.Red};
[17] = {background = Screen.colors.LightGrey, foreground = Screen.colors.DarkBlue};
[18] = {background = Screen.colors.LightGrey, foreground = Screen.colors.Red};
}
ns = meths.create_namespace 'test'
@@ -1971,6 +1975,37 @@ bbbbbbb]])
]],
})
end)
it('does not crash at column 0 when folded in a wide window', function()
screen:try_resize(82, 4)
command('hi! CursorLine guibg=NONE guifg=Red gui=NONE')
command('set cursorline')
insert([[
aaaaa
bbbbb
ccccc]])
meths.buf_set_extmark(0, ns, 0, 0, { virt_text = {{'foo'}}, virt_text_pos = 'inline' })
screen:expect{grid=[[
fooaaaaa |
bbbbb |
{16:cccc^c }|
|
]]}
command('1,2fold')
screen:expect{grid=[[
{17:+-- 2 lines: aaaaa·······························································}|
{16:cccc^c }|
{1:~ }|
|
]]}
feed('k')
screen:expect{grid=[[
{18:^+-- 2 lines: aaaaa·······························································}|
ccccc |
{1:~ }|
|
]]}
end)
end)
describe('decorations: virtual lines', function()