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

fix(treesitter): make Visual hl work consistently with foldtext (#25484)

Browse Source 
Problem:  Visual highlight is inconsistent on a folded line with
          treesitter foldtext.
Solution: Don't added Folded highlight as it is already in background.
This commit is contained in:
zeertzjq 2023-10-03 13:07:03 +08:00 committed by GitHub
parent 04af9d49ee
commit 3af59a415c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/lua/vim/treesitter/_fold.lua
View File

@ -401,7 +401,7 @@ function M.foldtext()
if start_col > line_pos then if start_col > line_pos then
table.insert(result, { table.insert(result, {
line:sub(line_pos + 1, start_col), line:sub(line_pos + 1, start_col),
{ { 'Folded', priority } }, {},
range = { line_pos, start_col }, range = { line_pos, start_col },
}) })
end end

179
test/functional/treesitter/fold_spec.lua
View File

@ -381,64 +381,42 @@ void qsort(void *base, size_t nel, size_t width, int (*compar)(const void *, con
} }
} }
}]] }]]
local screen
before_each(function()
screen = Screen.new(60, 5)
screen:set_default_attr_ids({
[0] = {foreground = Screen.colors.Blue, bold = true},
[1] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGray};
[2] = {bold = true, background = Screen.colors.LightGray, foreground = Screen.colors.SeaGreen};
[3] = {foreground = Screen.colors.DarkCyan, background = Screen.colors.LightGray};
[4] = {foreground = Screen.colors.SlateBlue, background = Screen.colors.LightGray};
[5] = {bold = true, background = Screen.colors.LightGray, foreground = Screen.colors.Brown};
[6] = {background = Screen.colors.Red1};
[7] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.Red};
[8] = {foreground = Screen.colors.Brown, bold = true, background = Screen.colors.Red};
[9] = {foreground = Screen.colors.SlateBlue, background = Screen.colors.Red};
[10] = {bold = true};
})
screen:attach()
end)
it('displays highlighted content', function() it('displays highlighted content', function()
local screen = Screen.new(60, 21)
screen:attach()
command([[set foldmethod=manual foldtext=v:lua.vim.treesitter.foldtext() updatetime=50]]) command([[set foldmethod=manual foldtext=v:lua.vim.treesitter.foldtext() updatetime=50]])
insert(test_text) insert(test_text)
exec_lua([[vim.treesitter.get_parser(0, "c")]]) exec_lua([[vim.treesitter.get_parser(0, "c")]])
feed('ggVGzf') feed('ggVGzf')
screen:expect{grid=[[
screen:expect({ {2:^void}{1: }{3:qsort}{4:(}{2:void}{1: }{5:*}{3:base}{4:,}{1: }{2:size_t}{1: }{3:nel}{4:,}{1: }{2:size_t}{1: }{3:width}{4:,}{1: }{2:int}{1: }{4:(}{5:*}{3:compa}|
grid = [[ {0:~ }|
{1:^void}{2: }{3:qsort}{4:(}{1:void}{2: }{5:*}{3:base}{4:,}{2: }{1:size_t}{2: }{3:nel}{4:,}{2: }{1:size_t}{2: }{3:width}{4:,}{2: }{1:int}{2: }{4:(}{5:*}{3:compa}| {0:~ }|
{6:~ }| {0:~ }|
{6:~ }| |
{6:~ }| ]]}
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
{6:~ }|
|
]],
attr_ids = {
[1] = {
foreground = Screen.colors.SeaGreen4,
background = Screen.colors.LightGrey,
bold = true,
},
[2] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Blue4 },
[3] = { background = Screen.colors.LightGrey, foreground = Screen.colors.DarkCyan },
[4] = { background = Screen.colors.LightGrey, foreground = Screen.colors.SlateBlue },
[5] = {
foreground = Screen.colors.Brown,
background = Screen.colors.LightGrey,
bold = true,
},
[6] = { foreground = Screen.colors.Blue, bold = true },
},
})
end) end)
it('handles deep nested captures', function() it('handles deep nested captures', function()
local screen = Screen.new(60, 21)
screen:attach()
command([[set foldmethod=manual foldtext=v:lua.vim.treesitter.foldtext() updatetime=50]]) command([[set foldmethod=manual foldtext=v:lua.vim.treesitter.foldtext() updatetime=50]])
insert([[ insert([[
function FoldInfo.new() function FoldInfo.new()
@ -448,86 +426,49 @@ function FoldInfo.new()
levels0 = {}, levels0 = {},
levels = {}, levels = {},
}, FoldInfo) }, FoldInfo)
end end]])
]])
exec_lua([[vim.treesitter.get_parser(0, "lua")]]) exec_lua([[vim.treesitter.get_parser(0, "lua")]])
feed('ggjVGkzf') feed('ggjVGkzfgg')
screen:expect{grid=[[
^function FoldInfo.new() |
{1: }{5:return}{1: }{4:setmetatable({}{1:·····································}|
end |
{0:~ }|
|
]]}
screen:expect({ command('hi! Visual guibg=Red')
grid = [[ feed('GVgg')
function FoldInfo.new() | screen:expect{grid=[[
{1:^ }{2:return}{1: }{3:setmetatable({}{1:·····································}| ^f{6:unction FoldInfo.new()} |
| {7: }{8:return}{7: }{9:setmetatable({}{7:·····································}|
{4:~ }| {6:end} |
{4:~ }| {0:~ }|
{4:~ }| {10:-- VISUAL LINE --} |
{4:~ }| ]]}
{4:~ }|
{4:~ }| feed('10l<C-V>')
{4:~ }| screen:expect{grid=[[
{4:~ }| {6:function F}^oldInfo.new() |
{4:~ }| {7: }{8:return}{7: }{9:se}{4:tmetatable({}{1:·····································}|
{4:~ }| {6:end} |
{4:~ }| {0:~ }|
{4:~ }| {10:-- VISUAL BLOCK --} |
{4:~ }| ]]}
{4:~ }|
{4:~ }|
{4:~ }|
{4:~ }|
|
]],
attr_ids = {
[1] = { foreground = Screen.colors.Blue4, background = Screen.colors.LightGray },
[2] = {
foreground = Screen.colors.Brown,
bold = true,
background = Screen.colors.LightGray,
},
[3] = { foreground = Screen.colors.SlateBlue, background = Screen.colors.LightGray },
[4] = { bold = true, foreground = Screen.colors.Blue },
},
})
end) end)
it('falls back to default', function() it('falls back to default', function()
local screen = Screen.new(60, 21)
screen:attach()
command([[set foldmethod=manual foldtext=v:lua.vim.treesitter.foldtext()]]) command([[set foldmethod=manual foldtext=v:lua.vim.treesitter.foldtext()]])
insert(test_text) insert(test_text)
feed('ggVGzf') feed('ggVGzf')
screen:expect{grid=[[
screen:expect({ {1:^+-- 19 lines: void qsort(void *base, size_t nel, size_t widt}|
grid = [[ {0:~ }|
{1:^+-- 19 lines: void qsort(void *base, size_t nel, size_t widt}| {0:~ }|
{2:~ }| {0:~ }|
{2:~ }| |
{2:~ }| ]]}
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
{2:~ }|
|
]],
attr_ids = {
[1] = { foreground = Screen.colors.Blue4, background = Screen.colors.LightGray },
[2] = { bold = true, foreground = Screen.colors.Blue },
},
})
end) end)
end) end)