mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-15 19:05:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(luahl): add priority mechanism

Browse Source 
Base priority is 0x1000, in order to stay kinda backward compatible.
Also set tree-sitter default highlight to 100 (middle-ish value)
This commit is contained in:
Thomas Vigouroux
2020-11-23 12:25:36 +01:00
parent 43ec616414
commit c0a6989d93
5 changed files with 125 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
test/functional/ui/bufhl_spec.lua
View File

@@ -534,6 +534,62 @@ describe('Buffer highlighting', function()
]]}
end)
it('respects priority', function()
local set_extmark = curbufmeths.set_extmark
local id = meths.create_namespace('')
insert [[foobar]]
set_extmark(id, 0, 0, {
end_line = 0,
end_col = 5,
hl_group = "Statement",
priority = 100
})
set_extmark(id, 0, 0, {
end_line = 0,
end_col = 6,
hl_group = "String",
priority = 1
})
screen:expect [[
{3:fooba}{2:^r} |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]
clear_namespace(id, 0, -1)
set_extmark(id, 0, 0, {
end_line = 0,
end_col = 6,
hl_group = "String",
priority = 1
})
set_extmark(id, 0, 0, {
end_line = 0,
end_col = 5,
hl_group = "Statement",
priority = 100
})
screen:expect [[
{3:fooba}{2:^r} |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]
end)
it('works with multibyte text', function()
insert([[
Ta båten över sjön!]])
@@ -699,12 +755,12 @@ describe('Buffer highlighting', function()
-- TODO: only a virtual text from the same ns curretly overrides
-- an existing virtual text. We might add a prioritation system.
set_virtual_text(id1, 0, s1, {})
eq({{1, 0, 0, {virt_text = s1}}}, get_extmarks(id1, {0,0}, {0, -1}, {details=true}))
eq({{1, 0, 0, { priority = 0, virt_text = s1}}}, get_extmarks(id1, {0,0}, {0, -1}, {details=true}))
-- TODO: is this really valid? shouldn't the max be line_count()-1?
local lastline = line_count()
set_virtual_text(id1, line_count(), s2, {})
eq({{3, lastline, 0, {virt_text = s2}}}, get_extmarks(id1, {lastline,0}, {lastline, -1}, {details=true}))
eq({{3, lastline, 0, { priority = 0, virt_text = s2}}}, get_extmarks(id1, {lastline,0}, {lastline, -1}, {details=true}))
eq({}, get_extmarks(id1, {lastline+9000,0}, {lastline+9000, -1}, {}))
end)