2024-04-20 08:44:13 -07:00
|
|
|
local t = require('test.testutil')
|
|
|
|
local n = require('test.functional.testnvim')()
|
2023-07-07 03:12:46 -07:00
|
|
|
local Screen = require('test.functional.ui.screen')
|
|
|
|
|
2024-04-20 08:44:13 -07:00
|
|
|
local clear = n.clear
|
|
|
|
local eq = t.eq
|
|
|
|
local insert = n.insert
|
|
|
|
local exec_lua = n.exec_lua
|
|
|
|
local command = n.command
|
|
|
|
local feed = n.feed
|
|
|
|
local poke_eventloop = n.poke_eventloop
|
|
|
|
|
2023-07-07 03:12:46 -07:00
|
|
|
before_each(clear)
|
|
|
|
|
|
|
|
describe('treesitter foldexpr', function()
|
|
|
|
clear()
|
|
|
|
|
2023-12-08 23:09:46 -07:00
|
|
|
before_each(function()
|
|
|
|
-- open folds to avoid deleting entire folded region
|
|
|
|
exec_lua([[vim.opt.foldlevel = 9]])
|
|
|
|
end)
|
|
|
|
|
2023-07-07 03:12:46 -07:00
|
|
|
local test_text = [[
|
|
|
|
void ui_refresh(void)
|
|
|
|
{
|
|
|
|
int width = INT_MAX, height = INT_MAX;
|
|
|
|
bool ext_widgets[kUIExtCount];
|
|
|
|
for (UIExtension i = 0; (int)i < kUIExtCount; i++) {
|
|
|
|
ext_widgets[i] = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool inclusive = ui_override();
|
|
|
|
for (size_t i = 0; i < ui_count; i++) {
|
|
|
|
UI *ui = uis[i];
|
|
|
|
width = MIN(ui->width, width);
|
|
|
|
height = MIN(ui->height, height);
|
|
|
|
foo = BAR(ui->bazaar, bazaar);
|
|
|
|
for (UIExtension j = 0; (int)j < kUIExtCount; j++) {
|
|
|
|
ext_widgets[j] &= (ui->ui_ext[j] || inclusive);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}]]
|
|
|
|
|
2023-12-08 23:09:46 -07:00
|
|
|
local function parse(lang)
|
|
|
|
exec_lua(
|
|
|
|
([[vim.treesitter.get_parser(0, %s):parse()]]):format(lang and '"' .. lang .. '"' or 'nil')
|
2024-01-02 18:09:18 -07:00
|
|
|
)
|
2023-12-08 23:09:46 -07:00
|
|
|
end
|
|
|
|
|
2023-07-07 03:12:46 -07:00
|
|
|
local function get_fold_levels()
|
|
|
|
return exec_lua([[
|
|
|
|
local res = {}
|
|
|
|
for i = 1, vim.api.nvim_buf_line_count(0) do
|
|
|
|
res[i] = vim.treesitter.foldexpr(i)
|
|
|
|
end
|
|
|
|
return res
|
|
|
|
]])
|
|
|
|
end
|
|
|
|
|
|
|
|
it('can compute fold levels', function()
|
|
|
|
insert(test_text)
|
|
|
|
|
2023-12-08 23:09:46 -07:00
|
|
|
parse('c')
|
2023-07-07 03:12:46 -07:00
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
[4] = '1',
|
|
|
|
[5] = '>2',
|
|
|
|
[6] = '2',
|
|
|
|
[7] = '2',
|
|
|
|
[8] = '1',
|
|
|
|
[9] = '1',
|
|
|
|
[10] = '>2',
|
|
|
|
[11] = '2',
|
|
|
|
[12] = '2',
|
|
|
|
[13] = '2',
|
|
|
|
[14] = '2',
|
|
|
|
[15] = '>3',
|
|
|
|
[16] = '3',
|
|
|
|
[17] = '3',
|
|
|
|
[18] = '2',
|
2023-12-08 23:09:46 -07:00
|
|
|
[19] = '1',
|
|
|
|
}, get_fold_levels())
|
2023-07-07 03:12:46 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
it('recomputes fold levels after lines are added/removed', function()
|
|
|
|
insert(test_text)
|
|
|
|
|
2023-12-08 23:09:46 -07:00
|
|
|
parse('c')
|
2023-07-07 03:12:46 -07:00
|
|
|
|
|
|
|
command('1,2d')
|
2023-12-08 23:09:46 -07:00
|
|
|
poke_eventloop()
|
2023-07-07 03:12:46 -07:00
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '0',
|
|
|
|
[2] = '0',
|
|
|
|
[3] = '>1',
|
|
|
|
[4] = '1',
|
|
|
|
[5] = '1',
|
|
|
|
[6] = '0',
|
|
|
|
[7] = '0',
|
|
|
|
[8] = '>1',
|
|
|
|
[9] = '1',
|
|
|
|
[10] = '1',
|
|
|
|
[11] = '1',
|
|
|
|
[12] = '1',
|
|
|
|
[13] = '>2',
|
|
|
|
[14] = '2',
|
|
|
|
[15] = '2',
|
|
|
|
[16] = '1',
|
2023-12-08 23:09:46 -07:00
|
|
|
[17] = '0',
|
|
|
|
}, get_fold_levels())
|
2023-07-07 03:12:46 -07:00
|
|
|
|
|
|
|
command('1put!')
|
2023-12-08 23:09:46 -07:00
|
|
|
poke_eventloop()
|
2023-07-07 03:12:46 -07:00
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
[4] = '1',
|
|
|
|
[5] = '>2',
|
|
|
|
[6] = '2',
|
|
|
|
[7] = '2',
|
|
|
|
[8] = '1',
|
|
|
|
[9] = '1',
|
|
|
|
[10] = '>2',
|
|
|
|
[11] = '2',
|
|
|
|
[12] = '2',
|
|
|
|
[13] = '2',
|
|
|
|
[14] = '2',
|
|
|
|
[15] = '>3',
|
|
|
|
[16] = '3',
|
|
|
|
[17] = '3',
|
|
|
|
[18] = '2',
|
2023-12-08 23:09:46 -07:00
|
|
|
[19] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('handles changes close to start/end of folds', function()
|
|
|
|
insert([[
|
|
|
|
# h1
|
|
|
|
t1
|
|
|
|
# h2
|
|
|
|
t2]])
|
|
|
|
|
|
|
|
exec_lua([[vim.treesitter.query.set('markdown', 'folds', '(section) @fold')]])
|
|
|
|
parse('markdown')
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '>1',
|
|
|
|
[4] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('2ggo<Esc>')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
[4] = '>1',
|
|
|
|
[5] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('dd')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '>1',
|
|
|
|
[4] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('2ggdd')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '0',
|
|
|
|
[2] = '>1',
|
|
|
|
[3] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('u')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '>1',
|
|
|
|
[4] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('3ggdd')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('u')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '>1',
|
|
|
|
[4] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('3ggI#<Esc>')
|
|
|
|
parse()
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '>2',
|
|
|
|
[4] = '2',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('x')
|
|
|
|
parse()
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '>1',
|
|
|
|
[4] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('handles changes that trigger multiple on_bytes', function()
|
|
|
|
insert([[
|
|
|
|
function f()
|
|
|
|
asdf()
|
|
|
|
asdf()
|
|
|
|
end
|
|
|
|
-- comment]])
|
|
|
|
|
|
|
|
exec_lua(
|
|
|
|
[[vim.treesitter.query.set('lua', 'folds', '[(function_declaration) (parameters) (arguments)] @fold')]]
|
|
|
|
)
|
|
|
|
parse('lua')
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
[4] = '1',
|
|
|
|
[5] = '0',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
command('1,4join')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '0',
|
|
|
|
[2] = '0',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('u')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
[4] = '1',
|
|
|
|
[5] = '0',
|
|
|
|
}, get_fold_levels())
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('handles multiple folds that overlap at the end and start', function()
|
|
|
|
insert([[
|
|
|
|
function f()
|
|
|
|
g(
|
|
|
|
function()
|
|
|
|
asdf()
|
|
|
|
end, function()
|
|
|
|
end
|
|
|
|
)
|
|
|
|
end]])
|
|
|
|
|
|
|
|
exec_lua(
|
|
|
|
[[vim.treesitter.query.set('lua', 'folds', '[(function_declaration) (function_definition) (parameters) (arguments)] @fold')]]
|
|
|
|
)
|
|
|
|
parse('lua')
|
|
|
|
|
|
|
|
-- If fold1.stop = fold2.start, then move fold1's stop up so that fold2.start gets proper level.
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '>2',
|
|
|
|
[3] = '>3',
|
|
|
|
[4] = '3',
|
|
|
|
[5] = '>3',
|
|
|
|
[6] = '3',
|
|
|
|
[7] = '2',
|
|
|
|
[8] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
command('1,8join')
|
|
|
|
feed('u')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '>2',
|
|
|
|
[3] = '>3',
|
|
|
|
[4] = '3',
|
|
|
|
[5] = '>3',
|
|
|
|
[6] = '3',
|
|
|
|
[7] = '2',
|
|
|
|
[8] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('handles multiple folds that start at the same line', function()
|
|
|
|
insert([[
|
|
|
|
function f(a)
|
|
|
|
if #(g({
|
|
|
|
k = v,
|
|
|
|
})) > 0 then
|
|
|
|
return
|
|
|
|
end
|
|
|
|
end]])
|
|
|
|
|
|
|
|
exec_lua(
|
|
|
|
[[vim.treesitter.query.set('lua', 'folds', '[(if_statement) (function_declaration) (parameters) (arguments) (table_constructor)] @fold')]]
|
|
|
|
)
|
|
|
|
parse('lua')
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '>3',
|
|
|
|
[3] = '3',
|
|
|
|
[4] = '3',
|
|
|
|
[5] = '2',
|
|
|
|
[6] = '2',
|
|
|
|
[7] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
command('2,6join')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
feed('u')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '>3',
|
|
|
|
[3] = '3',
|
|
|
|
[4] = '3',
|
|
|
|
[5] = '2',
|
|
|
|
[6] = '2',
|
|
|
|
[7] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('takes account of relevant options', function()
|
|
|
|
insert([[
|
|
|
|
# h1
|
|
|
|
t1
|
|
|
|
## h2
|
|
|
|
t2
|
|
|
|
### h3
|
|
|
|
t3]])
|
|
|
|
|
|
|
|
exec_lua([[vim.treesitter.query.set('markdown', 'folds', '(section) @fold')]])
|
|
|
|
parse('markdown')
|
|
|
|
|
|
|
|
command([[set foldminlines=2]])
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '>2',
|
|
|
|
[4] = '2',
|
|
|
|
[5] = '2',
|
|
|
|
[6] = '2',
|
|
|
|
}, get_fold_levels())
|
|
|
|
|
|
|
|
command([[set foldminlines=1 foldnestmax=1]])
|
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
[4] = '1',
|
|
|
|
[5] = '1',
|
|
|
|
[6] = '1',
|
|
|
|
}, get_fold_levels())
|
2023-07-07 03:12:46 -07:00
|
|
|
end)
|
|
|
|
|
2024-04-20 10:36:17 -07:00
|
|
|
it('handles quantified patterns', function()
|
|
|
|
insert([[
|
2024-07-09 06:26:48 -07:00
|
|
|
-- hello
|
|
|
|
-- hello
|
|
|
|
-- hello
|
|
|
|
-- hello
|
|
|
|
-- hello
|
|
|
|
-- hello]])
|
|
|
|
|
|
|
|
exec_lua([[vim.treesitter.query.set('lua', 'folds', '(comment)+ @fold')]])
|
|
|
|
parse('lua')
|
2024-04-20 10:36:17 -07:00
|
|
|
|
|
|
|
eq({
|
|
|
|
[1] = '>1',
|
|
|
|
[2] = '1',
|
|
|
|
[3] = '1',
|
|
|
|
[4] = '1',
|
|
|
|
[5] = '1',
|
|
|
|
[6] = '1',
|
|
|
|
}, get_fold_levels())
|
|
|
|
end)
|
|
|
|
|
2023-07-07 03:12:46 -07:00
|
|
|
it('updates folds in all windows', function()
|
|
|
|
local screen = Screen.new(60, 48)
|
|
|
|
screen:attach()
|
|
|
|
screen:set_default_attr_ids({
|
|
|
|
[1] = { background = Screen.colors.Grey, foreground = Screen.colors.DarkBlue },
|
|
|
|
[2] = { bold = true, foreground = Screen.colors.Blue1 },
|
|
|
|
[3] = { bold = true, reverse = true },
|
|
|
|
[4] = { reverse = true },
|
|
|
|
})
|
|
|
|
|
2023-12-08 23:09:46 -07:00
|
|
|
parse('c')
|
|
|
|
command([[set foldmethod=expr foldexpr=v:lua.vim.treesitter.foldexpr() foldcolumn=1]])
|
2023-07-07 03:12:46 -07:00
|
|
|
command('split')
|
|
|
|
|
|
|
|
insert(test_text)
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{1:-}void ui_refresh(void) |
|
|
|
|
{1:│}{ |
|
|
|
|
{1:│} int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{1:│} bool ext_widgets[kUIExtCount]; |
|
|
|
|
{1:-} for (UIExtension i = 0; (int)i < kUIExtCount; i++) { |
|
|
|
|
{1:2} ext_widgets[i] = true; |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│} |
|
|
|
|
{1:│} bool inclusive = ui_override(); |
|
|
|
|
{1:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1:2} UI *ui = uis[i]; |
|
|
|
|
{1:2} width = MIN(ui->width, width); |
|
|
|
|
{1:2} height = MIN(ui->height, height); |
|
|
|
|
{1:2} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1:3} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1:3} } |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│}^} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{2:~ }|*4
|
2023-07-07 03:12:46 -07:00
|
|
|
{3:[No Name] [+] }|
|
|
|
|
{1:-}void ui_refresh(void) |
|
|
|
|
{1:│}{ |
|
|
|
|
{1:│} int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{1:│} bool ext_widgets[kUIExtCount]; |
|
|
|
|
{1:-} for (UIExtension i = 0; (int)i < kUIExtCount; i++) { |
|
|
|
|
{1:2} ext_widgets[i] = true; |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│} |
|
|
|
|
{1:│} bool inclusive = ui_override(); |
|
|
|
|
{1:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1:2} UI *ui = uis[i]; |
|
|
|
|
{1:2} width = MIN(ui->width, width); |
|
|
|
|
{1:2} height = MIN(ui->height, height); |
|
|
|
|
{1:2} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1:3} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1:3} } |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│}} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{2:~ }|*3
|
2023-07-07 03:12:46 -07:00
|
|
|
{4:[No Name] [+] }|
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
command('1,2d')
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{1: } ^int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{1: } bool ext_widgets[kUIExtCount]; |
|
|
|
|
{1:-} for (UIExtension i = 0; (int)i < kUIExtCount; i++) { |
|
|
|
|
{1:│} ext_widgets[i] = true; |
|
|
|
|
{1:│} } |
|
|
|
|
{1: } |
|
|
|
|
{1: } bool inclusive = ui_override(); |
|
|
|
|
{1:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1:│} UI *ui = uis[i]; |
|
|
|
|
{1:│} width = MIN(ui->width, width); |
|
|
|
|
{1:│} height = MIN(ui->height, height); |
|
|
|
|
{1:│} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1:2} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│} } |
|
|
|
|
{1: }} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{2:~ }|*6
|
2023-07-07 03:12:46 -07:00
|
|
|
{3:[No Name] [+] }|
|
|
|
|
{1: } int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{1: } bool ext_widgets[kUIExtCount]; |
|
|
|
|
{1:-} for (UIExtension i = 0; (int)i < kUIExtCount; i++) { |
|
|
|
|
{1:│} ext_widgets[i] = true; |
|
|
|
|
{1:│} } |
|
|
|
|
{1: } |
|
|
|
|
{1: } bool inclusive = ui_override(); |
|
|
|
|
{1:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1:│} UI *ui = uis[i]; |
|
|
|
|
{1:│} width = MIN(ui->width, width); |
|
|
|
|
{1:│} height = MIN(ui->height, height); |
|
|
|
|
{1:│} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1:2} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│} } |
|
|
|
|
{1: }} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{2:~ }|*5
|
2023-07-07 03:12:46 -07:00
|
|
|
{4:[No Name] [+] }|
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed([[O<C-u><C-r>"<BS><Esc>]])
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{1:-}void ui_refresh(void) |
|
|
|
|
{1:│}^{ |
|
|
|
|
{1:│} int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{1:│} bool ext_widgets[kUIExtCount]; |
|
|
|
|
{1:-} for (UIExtension i = 0; (int)i < kUIExtCount; i++) { |
|
|
|
|
{1:2} ext_widgets[i] = true; |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│} |
|
|
|
|
{1:│} bool inclusive = ui_override(); |
|
|
|
|
{1:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1:2} UI *ui = uis[i]; |
|
|
|
|
{1:2} width = MIN(ui->width, width); |
|
|
|
|
{1:2} height = MIN(ui->height, height); |
|
|
|
|
{1:2} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1:3} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1:3} } |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│}} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{2:~ }|*4
|
2023-07-07 03:12:46 -07:00
|
|
|
{3:[No Name] [+] }|
|
|
|
|
{1:-}void ui_refresh(void) |
|
|
|
|
{1:│}{ |
|
|
|
|
{1:│} int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{1:│} bool ext_widgets[kUIExtCount]; |
|
|
|
|
{1:-} for (UIExtension i = 0; (int)i < kUIExtCount; i++) { |
|
|
|
|
{1:2} ext_widgets[i] = true; |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│} |
|
|
|
|
{1:│} bool inclusive = ui_override(); |
|
|
|
|
{1:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1:2} UI *ui = uis[i]; |
|
|
|
|
{1:2} width = MIN(ui->width, width); |
|
|
|
|
{1:2} height = MIN(ui->height, height); |
|
|
|
|
{1:2} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1:3} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1:3} } |
|
|
|
|
{1:2} } |
|
|
|
|
{1:│}} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{2:~ }|*3
|
2023-07-07 03:12:46 -07:00
|
|
|
{4:[No Name] [+] }|
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
|
|
|
it("doesn't open folds in diff mode", function()
|
|
|
|
local screen = Screen.new(60, 36)
|
|
|
|
screen:attach()
|
|
|
|
|
2023-12-08 23:09:46 -07:00
|
|
|
parse('c')
|
2023-07-07 03:12:46 -07:00
|
|
|
command(
|
|
|
|
[[set foldmethod=expr foldexpr=v:lua.vim.treesitter.foldexpr() foldcolumn=1 foldlevel=9]]
|
|
|
|
)
|
|
|
|
insert(test_text)
|
|
|
|
command('16d')
|
|
|
|
|
|
|
|
command('new')
|
|
|
|
insert(test_text)
|
|
|
|
|
|
|
|
command('windo diffthis')
|
|
|
|
feed('do')
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{1:+ }{2:+-- 9 lines: void ui_refresh(void)·······················}|
|
|
|
|
{1: } for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1: } UI *ui = uis[i]; |
|
|
|
|
{1: } width = MIN(ui->width, width); |
|
|
|
|
{1: } height = MIN(ui->height, height); |
|
|
|
|
{1: } foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1: } for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1: } ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1: } } |
|
|
|
|
{1: } } |
|
|
|
|
{1: }} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{3:~ }|*6
|
2023-07-07 03:12:46 -07:00
|
|
|
{4:[No Name] [+] }|
|
|
|
|
{1:+ }{2:+-- 9 lines: void ui_refresh(void)·······················}|
|
|
|
|
{1: } for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{1: } UI *ui = uis[i]; |
|
|
|
|
{1: } width = MIN(ui->width, width); |
|
|
|
|
{1: } height = MIN(ui->height, height); |
|
|
|
|
{1: } foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{1: } for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{1: } ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{1: } ^} |
|
|
|
|
{1: } } |
|
|
|
|
{1: }} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{3:~ }|*5
|
2023-07-07 03:12:46 -07:00
|
|
|
{5:[No Name] [+] }|
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
attr_ids = {
|
|
|
|
[1] = { background = Screen.colors.Grey, foreground = Screen.colors.Blue4 },
|
|
|
|
[2] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Blue4 },
|
|
|
|
[3] = { foreground = Screen.colors.Blue, bold = true },
|
|
|
|
[4] = { reverse = true },
|
|
|
|
[5] = { reverse = true, bold = true },
|
2024-01-02 18:09:18 -07:00
|
|
|
},
|
2023-07-07 03:12:46 -07:00
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
2024-06-20 06:37:09 -07:00
|
|
|
it('does not extend closed fold with `o`/`O`', function()
|
|
|
|
local screen = Screen.new(60, 24)
|
|
|
|
screen:attach()
|
|
|
|
|
|
|
|
insert(test_text)
|
|
|
|
parse('c')
|
|
|
|
command([[set foldmethod=expr foldexpr=v:lua.vim.treesitter.foldexpr() foldcolumn=1]])
|
|
|
|
|
|
|
|
feed('5ggzco')
|
|
|
|
screen:expect({
|
|
|
|
grid = [[
|
|
|
|
{7:-}void ui_refresh(void) |
|
|
|
|
{7:│}{ |
|
|
|
|
{7:│} int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{7:│} bool ext_widgets[kUIExtCount]; |
|
|
|
|
{7:+}{13:+--- 3 lines: for (UIExtension i = 0; (int)i < kUIExtCount}|
|
|
|
|
{7:│}^ |
|
|
|
|
{7:│} |
|
|
|
|
{7:│} bool inclusive = ui_override(); |
|
|
|
|
{7:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{7:2} UI *ui = uis[i]; |
|
|
|
|
{7:2} width = MIN(ui->width, width); |
|
|
|
|
{7:2} height = MIN(ui->height, height); |
|
|
|
|
{7:2} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{7:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{7:3} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{7:3} } |
|
|
|
|
{7:2} } |
|
|
|
|
{7:│}} |
|
|
|
|
{1:~ }|*5
|
|
|
|
{5:-- INSERT --} |
|
|
|
|
]],
|
|
|
|
})
|
|
|
|
|
|
|
|
feed('<Esc>O')
|
|
|
|
screen:expect({
|
|
|
|
grid = [[
|
|
|
|
{7:-}void ui_refresh(void) |
|
|
|
|
{7:│}{ |
|
|
|
|
{7:│} int width = INT_MAX, height = INT_MAX; |
|
|
|
|
{7:│} bool ext_widgets[kUIExtCount]; |
|
|
|
|
{7:+}{13:+--- 3 lines: for (UIExtension i = 0; (int)i < kUIExtCount}|
|
|
|
|
{7:│}^ |
|
|
|
|
{7:│} |*2
|
|
|
|
{7:│} bool inclusive = ui_override(); |
|
|
|
|
{7:-} for (size_t i = 0; i < ui_count; i++) { |
|
|
|
|
{7:2} UI *ui = uis[i]; |
|
|
|
|
{7:2} width = MIN(ui->width, width); |
|
|
|
|
{7:2} height = MIN(ui->height, height); |
|
|
|
|
{7:2} foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
{7:-} for (UIExtension j = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
{7:3} ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{7:3} } |
|
|
|
|
{7:2} } |
|
|
|
|
{7:│}} |
|
|
|
|
{1:~ }|*4
|
|
|
|
{5:-- INSERT --} |
|
|
|
|
]],
|
|
|
|
})
|
|
|
|
end)
|
|
|
|
|
2023-12-08 23:09:46 -07:00
|
|
|
it("doesn't open folds that are not touched", function()
|
|
|
|
local screen = Screen.new(40, 8)
|
|
|
|
screen:set_default_attr_ids({
|
|
|
|
[1] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.Gray },
|
|
|
|
[2] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGray },
|
|
|
|
[3] = { foreground = Screen.colors.Blue1, bold = true },
|
|
|
|
[4] = { bold = true },
|
|
|
|
})
|
|
|
|
screen:attach()
|
|
|
|
|
|
|
|
insert([[
|
|
|
|
# h1
|
|
|
|
t1
|
|
|
|
# h2
|
|
|
|
t2]])
|
|
|
|
exec_lua([[vim.treesitter.query.set('markdown', 'folds', '(section) @fold')]])
|
|
|
|
parse('markdown')
|
|
|
|
command(
|
|
|
|
[[set foldmethod=expr foldexpr=v:lua.vim.treesitter.foldexpr() foldcolumn=1 foldlevel=0]]
|
|
|
|
)
|
|
|
|
|
|
|
|
feed('ggzojo')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{1:-}# h1 |
|
|
|
|
{1:│}t1 |
|
2024-06-20 06:37:09 -07:00
|
|
|
{1:-}^ |
|
2023-12-08 23:09:46 -07:00
|
|
|
{1:+}{2:+-- 2 lines: # h2·····················}|
|
2023-12-12 05:34:02 -07:00
|
|
|
{3:~ }|*3
|
2023-12-08 23:09:46 -07:00
|
|
|
{4:-- INSERT --} |
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed('<Esc>u')
|
|
|
|
-- TODO(tomtomjhj): `u` spuriously opens the fold (#26499).
|
|
|
|
feed('zMggzo')
|
|
|
|
|
|
|
|
feed('dd')
|
|
|
|
poke_eventloop()
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{1:-}^t1 |
|
|
|
|
{1:-}# h2 |
|
|
|
|
{1:│}t2 |
|
2023-12-12 05:34:02 -07:00
|
|
|
{3:~ }|*4
|
2023-12-11 19:44:17 -07:00
|
|
|
1 line less; before #2 {MATCH:.*}|
|
2023-12-08 23:09:46 -07:00
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
2023-07-07 03:12:46 -07:00
|
|
|
end)
|