2021-01-03 06:38:12 -07:00
|
|
|
local helpers = require('test.functional.helpers')(after_each)
|
|
|
|
local Screen = require('test.functional.ui.screen')
|
|
|
|
|
|
|
|
local clear = helpers.clear
|
|
|
|
local insert = helpers.insert
|
|
|
|
local exec_lua = helpers.exec_lua
|
|
|
|
local feed = helpers.feed
|
2022-08-24 14:48:52 -07:00
|
|
|
local command = helpers.command
|
2024-01-12 10:59:57 -07:00
|
|
|
local api = helpers.api
|
2022-08-24 14:48:52 -07:00
|
|
|
local eq = helpers.eq
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
before_each(clear)
|
|
|
|
|
2023-04-30 08:11:38 -07:00
|
|
|
local hl_query_c = [[
|
2022-08-24 14:48:52 -07:00
|
|
|
(ERROR) @error
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
"if" @keyword
|
|
|
|
"else" @keyword
|
|
|
|
"for" @keyword
|
|
|
|
"return" @keyword
|
|
|
|
|
|
|
|
"const" @type
|
|
|
|
"static" @type
|
|
|
|
"struct" @type
|
|
|
|
"enum" @type
|
|
|
|
"extern" @type
|
|
|
|
|
2022-08-24 14:48:52 -07:00
|
|
|
; nonexistent specializer for string should fallback to string
|
|
|
|
(string_literal) @string.nonexistent_specializer
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
(number_literal) @number
|
|
|
|
(char_literal) @string
|
|
|
|
|
|
|
|
(type_identifier) @type
|
2022-08-24 14:48:52 -07:00
|
|
|
((type_identifier) @constant.builtin (#eq? @constant.builtin "LuaRef"))
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
(primitive_type) @type
|
|
|
|
(sized_type_specifier) @type
|
|
|
|
|
|
|
|
; Use lua regexes
|
2022-08-24 14:48:52 -07:00
|
|
|
((identifier) @function (#contains? @function "lua_"))
|
2021-01-03 06:38:12 -07:00
|
|
|
((identifier) @Constant (#lua-match? @Constant "^[A-Z_]+$"))
|
2022-08-24 14:48:52 -07:00
|
|
|
((identifier) @Normal (#vim-match? @Normal "^lstate$"))
|
2021-01-03 06:38:12 -07:00
|
|
|
|
2022-08-24 14:48:52 -07:00
|
|
|
((binary_expression left: (identifier) @warning.left right: (identifier) @warning.right) (#eq? @warning.left @warning.right))
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
(comment) @comment
|
|
|
|
]]
|
|
|
|
|
2023-04-30 08:11:38 -07:00
|
|
|
local hl_text_c = [[
|
2021-01-03 06:38:12 -07:00
|
|
|
/// Schedule Lua callback on main loop's event queue
|
|
|
|
static int nlua_schedule(lua_State *const lstate)
|
|
|
|
{
|
|
|
|
if (lua_type(lstate, 1) != LUA_TFUNCTION
|
|
|
|
|| lstate != lstate) {
|
|
|
|
lua_pushliteral(lstate, "vim.schedule: expected function");
|
|
|
|
return lua_error(lstate);
|
|
|
|
}
|
|
|
|
|
|
|
|
LuaRef cb = nlua_ref(lstate, 1);
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, nlua_schedule_event,
|
|
|
|
1, (void *)(ptrdiff_t)cb);
|
|
|
|
return 0;
|
|
|
|
}]]
|
|
|
|
|
2023-04-30 08:11:38 -07:00
|
|
|
local test_text_c = [[
|
2021-01-03 06:38:12 -07:00
|
|
|
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-09-13 16:51:54 -07:00
|
|
|
local injection_text_c = [[
|
|
|
|
int x = INT_MAX;
|
|
|
|
#define READ_STRING(x, y) (char *)read_string((x), (size_t)(y))
|
|
|
|
#define foo void main() { \
|
|
|
|
return 42; \
|
|
|
|
}
|
|
|
|
]]
|
|
|
|
|
|
|
|
local injection_grid_c = [[
|
|
|
|
int x = INT_MAX; |
|
|
|
|
#define READ_STRING(x, y) (char *)read_string((x), (size_t)(y)) |
|
|
|
|
#define foo void main() { \ |
|
|
|
|
return 42; \ |
|
|
|
|
} |
|
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*11
|
2023-09-13 16:51:54 -07:00
|
|
|
|
|
|
|
|
]]
|
|
|
|
|
|
|
|
local injection_grid_expected_c = [[
|
|
|
|
{3:int} x = {5:INT_MAX}; |
|
|
|
|
#define {5:READ_STRING}(x, y) ({3:char} *)read_string((x), ({3:size_t})(y)) |
|
|
|
|
#define foo {3:void} main() { \ |
|
|
|
|
{4:return} {5:42}; \ |
|
|
|
|
} |
|
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*11
|
2023-09-13 16:51:54 -07:00
|
|
|
|
|
|
|
|
]]
|
|
|
|
|
2023-04-30 08:11:38 -07:00
|
|
|
describe('treesitter highlighting (C)', function()
|
2021-01-03 06:38:12 -07:00
|
|
|
local screen
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
screen = Screen.new(65, 18)
|
|
|
|
screen:attach()
|
|
|
|
screen:set_default_attr_ids {
|
|
|
|
[1] = { bold = true, foreground = Screen.colors.Blue1 },
|
|
|
|
[2] = { foreground = Screen.colors.Blue1 },
|
|
|
|
[3] = { bold = true, foreground = Screen.colors.SeaGreen4 },
|
|
|
|
[4] = { bold = true, foreground = Screen.colors.Brown },
|
|
|
|
[5] = { foreground = Screen.colors.Magenta },
|
|
|
|
[6] = { foreground = Screen.colors.Red },
|
|
|
|
[7] = { bold = true, foreground = Screen.colors.SlateBlue },
|
|
|
|
[8] = { foreground = Screen.colors.Grey100, background = Screen.colors.Red },
|
|
|
|
[9] = { foreground = Screen.colors.Magenta, background = Screen.colors.Red },
|
|
|
|
[10] = { foreground = Screen.colors.Red, background = Screen.colors.Red },
|
|
|
|
[11] = { foreground = Screen.colors.Cyan4 },
|
|
|
|
}
|
|
|
|
|
2023-04-30 08:11:38 -07:00
|
|
|
exec_lua([[ hl_query = ... ]], hl_query_c)
|
2022-09-04 08:58:33 -07:00
|
|
|
command [[ hi link @error ErrorMsg ]]
|
2022-08-24 14:48:52 -07:00
|
|
|
command [[ hi link @warning WarningMsg ]]
|
2021-01-03 06:38:12 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
it('is updated with edits', function()
|
2023-04-30 08:11:38 -07:00
|
|
|
insert(hl_text_c)
|
2021-01-03 06:38:12 -07:00
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
/// Schedule Lua callback on main loop's event queue |
|
|
|
|
static int nlua_schedule(lua_State *const lstate) |
|
|
|
|
{ |
|
|
|
|
if (lua_type(lstate, 1) != LUA_TFUNCTION |
|
|
|
|
|| lstate != lstate) { |
|
|
|
|
lua_pushliteral(lstate, "vim.schedule: expected function"); |
|
|
|
|
return lua_error(lstate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
LuaRef cb = nlua_ref(lstate, 1); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, nlua_schedule_event, |
|
|
|
|
1, (void *)(ptrdiff_t)cb); |
|
|
|
|
return 0; |
|
|
|
|
^} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*2
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c")
|
|
|
|
local highlighter = vim.treesitter.highlighter
|
|
|
|
test_hl = highlighter.new(parser, {queries = {c = hl_query}})
|
|
|
|
]]
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queue} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} |
|
|
|
|
|| {6:lstate} != {6:lstate}) { |
|
|
|
|
{11:lua_pushliteral}(lstate, {5:"vim.schedule: expected function"}); |
|
|
|
|
{4:return} {11:lua_error}(lstate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
^} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*2
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed('5Goc<esc>dd')
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queue} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} |
|
|
|
|
|| {6:lstate} != {6:lstate}) { |
|
|
|
|
{11:^lua_pushliteral}(lstate, {5:"vim.schedule: expected function"}); |
|
|
|
|
{4:return} {11:lua_error}(lstate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*2
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed('7Go*/<esc>')
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queue} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} |
|
|
|
|
|| {6:lstate} != {6:lstate}) { |
|
|
|
|
{11:lua_pushliteral}(lstate, {5:"vim.schedule: expected function"}); |
|
|
|
|
{4:return} {11:lua_error}(lstate); |
|
|
|
|
{8:*^/} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
} |
|
|
|
|
{1:~ }|
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed('3Go/*<esc>')
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queue} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{2:/^*} |
|
|
|
|
{2: if (lua_type(lstate, 1) != LUA_TFUNCTION} |
|
|
|
|
{2: || lstate != lstate) {} |
|
|
|
|
{2: lua_pushliteral(lstate, "vim.schedule: expected function");} |
|
|
|
|
{2: return lua_error(lstate);} |
|
|
|
|
{2:*/} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
{8:}} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed('gg$')
|
|
|
|
feed('~')
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queu^E} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{2:/*} |
|
|
|
|
{2: if (lua_type(lstate, 1) != LUA_TFUNCTION} |
|
|
|
|
{2: || lstate != lstate) {} |
|
|
|
|
{2: lua_pushliteral(lstate, "vim.schedule: expected function");} |
|
|
|
|
{2: return lua_error(lstate);} |
|
|
|
|
{2:*/} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
{8:}} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed('re')
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queu^e} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{2:/*} |
|
|
|
|
{2: if (lua_type(lstate, 1) != LUA_TFUNCTION} |
|
|
|
|
{2: || lstate != lstate) {} |
|
|
|
|
{2: lua_pushliteral(lstate, "vim.schedule: expected function");} |
|
|
|
|
{2: return lua_error(lstate);} |
|
|
|
|
{2:*/} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
{8:}} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
2021-01-02 03:05:30 -07:00
|
|
|
it('is updated with :sort', function()
|
2023-04-30 08:11:38 -07:00
|
|
|
insert(test_text_c)
|
2021-01-02 03:05:30 -07:00
|
|
|
exec_lua [[
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c")
|
|
|
|
test_hl = vim.treesitter.highlighter.new(parser, {queries = {c = hl_query}})
|
|
|
|
]]
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{3:int} width = {5:INT_MAX}, height = {5:INT_MAX}; |
|
|
|
|
{3:bool} ext_widgets[kUIExtCount]; |
|
|
|
|
{4:for} ({3:UIExtension} i = {5:0}; ({3:int})i < kUIExtCount; i++) { |
|
|
|
|
ext_widgets[i] = true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{3:bool} inclusive = ui_override(); |
|
|
|
|
{4:for} ({3:size_t} i = {5:0}; i < ui_count; i++) { |
|
|
|
|
{3:UI} *ui = uis[i]; |
|
|
|
|
width = {5:MIN}(ui->width, width); |
|
|
|
|
height = {5:MIN}(ui->height, height); |
|
|
|
|
foo = {5:BAR}(ui->bazaar, bazaar); |
|
|
|
|
{4:for} ({3:UIExtension} j = {5:0}; ({3:int})j < kUIExtCount; j++) { |
|
|
|
|
ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
^} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed ':sort<cr>'
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
^ |
|
|
|
|
ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
{3:UI} *ui = uis[i]; |
|
|
|
|
ext_widgets[i] = true; |
|
|
|
|
foo = {5:BAR}(ui->bazaar, bazaar); |
|
|
|
|
{4:for} ({3:UIExtension} j = {5:0}; ({3:int})j < kUIExtCount; j++) { |
|
|
|
|
height = {5:MIN}(ui->height, height); |
|
|
|
|
width = {5:MIN}(ui->width, width); |
|
|
|
|
} |
|
|
|
|
{3:bool} ext_widgets[kUIExtCount]; |
|
|
|
|
{3:bool} inclusive = ui_override(); |
|
|
|
|
{4:for} ({3:UIExtension} i = {5:0}; ({3:int})i < kUIExtCount; i++) { |
|
|
|
|
{4:for} ({3:size_t} i = {5:0}; i < ui_count; i++) { |
|
|
|
|
{3:int} width = {5:INT_MAX}, height = {5:INT_MAX}; |
|
2023-12-09 05:42:00 -07:00
|
|
|
} |*2
|
2021-01-02 03:05:30 -07:00
|
|
|
{3:void} ui_refresh({3:void}) |
|
|
|
|
:sort |
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
feed 'u'
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{3:int} width = {5:INT_MAX}, height = {5:INT_MAX}; |
|
|
|
|
{3:bool} ext_widgets[kUIExtCount]; |
|
|
|
|
{4:for} ({3:UIExtension} i = {5:0}; ({3:int})i < kUIExtCount; i++) { |
|
|
|
|
ext_widgets[i] = true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{3:bool} inclusive = ui_override(); |
|
|
|
|
{4:for} ({3:size_t} i = {5:0}; i < ui_count; i++) { |
|
|
|
|
{3:UI} *ui = uis[i]; |
|
|
|
|
width = {5:MIN}(ui->width, width); |
|
|
|
|
height = {5:MIN}(ui->height, height); |
|
|
|
|
foo = {5:BAR}(ui->bazaar, bazaar); |
|
|
|
|
{4:for} ({3:UIExtension} j = {5:0}; ({3:int})j < kUIExtCount; j++) { |
|
|
|
|
ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
^} |
|
|
|
|
19 changes; before #2 {MATCH:.*}|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
2021-01-03 06:38:12 -07:00
|
|
|
it('supports with custom parser', function()
|
|
|
|
screen:set_default_attr_ids {
|
|
|
|
[1] = { bold = true, foreground = Screen.colors.SeaGreen4 },
|
|
|
|
}
|
|
|
|
|
2023-04-30 08:11:38 -07:00
|
|
|
insert(test_text_c)
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
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); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
^} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
parser = vim.treesitter.get_parser(0, "c")
|
2023-03-24 07:43:14 -07:00
|
|
|
query = vim.treesitter.query.parse("c", "(declaration) @decl")
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
local nodes = {}
|
|
|
|
for _, node in query:iter_captures(parser:parse()[1]:root(), 0, 0, 19) do
|
|
|
|
table.insert(nodes, node)
|
|
|
|
end
|
|
|
|
|
|
|
|
parser:set_included_regions({nodes})
|
|
|
|
|
|
|
|
local hl = vim.treesitter.highlighter.new(parser, {queries = {c = "(identifier) @type"}})
|
|
|
|
]]
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
int {1:width} = {1:INT_MAX}, {1:height} = {1:INT_MAX}; |
|
|
|
|
bool {1:ext_widgets}[{1:kUIExtCount}]; |
|
|
|
|
for (UIExtension {1:i} = 0; (int)i < kUIExtCount; i++) { |
|
|
|
|
ext_widgets[i] = true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool {1:inclusive} = {1:ui_override}(); |
|
|
|
|
for (size_t {1:i} = 0; i < ui_count; i++) { |
|
|
|
|
UI *{1:ui} = {1:uis}[{1:i}]; |
|
|
|
|
width = MIN(ui->width, width); |
|
|
|
|
height = MIN(ui->height, height); |
|
|
|
|
foo = BAR(ui->bazaar, bazaar); |
|
|
|
|
for (UIExtension {1:j} = 0; (int)j < kUIExtCount; j++) { |
|
|
|
|
ext_widgets[j] &= (ui->ui_ext[j] || inclusive); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
^} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('supports injected languages', function()
|
2023-09-13 16:51:54 -07:00
|
|
|
insert(injection_text_c)
|
2021-01-03 06:38:12 -07:00
|
|
|
|
2023-09-13 16:51:54 -07:00
|
|
|
screen:expect { grid = injection_grid_c }
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c", {
|
2023-08-12 08:54:04 -07:00
|
|
|
injections = {c = '(preproc_def (preproc_arg) @injection.content (#set! injection.language "c")) (preproc_function_def value: (preproc_arg) @injection.content (#set! injection.language "c"))'}
|
2021-01-03 06:38:12 -07:00
|
|
|
})
|
|
|
|
local highlighter = vim.treesitter.highlighter
|
|
|
|
test_hl = highlighter.new(parser, {queries = {c = hl_query}})
|
|
|
|
]]
|
|
|
|
|
2023-09-13 16:51:54 -07:00
|
|
|
screen:expect { grid = injection_grid_expected_c }
|
|
|
|
end)
|
|
|
|
|
|
|
|
it("supports injecting by ft name in metadata['injection.language']", function()
|
|
|
|
insert(injection_text_c)
|
|
|
|
|
|
|
|
screen:expect { grid = injection_grid_c }
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
vim.treesitter.language.register("c", "foo")
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c", {
|
|
|
|
injections = {c = '(preproc_def (preproc_arg) @injection.content (#set! injection.language "fOO")) (preproc_function_def value: (preproc_arg) @injection.content (#set! injection.language "fOO"))'}
|
|
|
|
})
|
|
|
|
local highlighter = vim.treesitter.highlighter
|
|
|
|
test_hl = highlighter.new(parser, {queries = {c = hl_query}})
|
|
|
|
]]
|
|
|
|
|
|
|
|
screen:expect { grid = injection_grid_expected_c }
|
2021-03-30 07:57:38 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
it('supports overriding queries, like ', function()
|
|
|
|
insert([[
|
|
|
|
int x = INT_MAX;
|
2023-04-02 01:11:42 -07:00
|
|
|
#define READ_STRING(x, y) (char *)read_string((x), (size_t)(y))
|
2021-03-30 07:57:38 -07:00
|
|
|
#define foo void main() { \
|
|
|
|
return 42; \
|
|
|
|
}
|
|
|
|
]])
|
|
|
|
|
|
|
|
exec_lua [[
|
2023-08-12 08:54:04 -07:00
|
|
|
local injection_query = '(preproc_def (preproc_arg) @injection.content (#set! injection.language "c")) (preproc_function_def value: (preproc_arg) @injection.content (#set! injection.language "c"))'
|
2023-03-24 07:43:14 -07:00
|
|
|
vim.treesitter.query.set("c", "highlights", hl_query)
|
|
|
|
vim.treesitter.query.set("c", "injections", injection_query)
|
2021-03-30 07:57:38 -07:00
|
|
|
|
|
|
|
vim.treesitter.highlighter.new(vim.treesitter.get_parser(0, "c"))
|
|
|
|
]]
|
|
|
|
|
2021-01-03 06:38:12 -07:00
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{3:int} x = {5:INT_MAX}; |
|
2023-04-02 01:11:42 -07:00
|
|
|
#define {5:READ_STRING}(x, y) ({3:char} *)read_string((x), ({3:size_t})(y)) |
|
2021-01-03 06:38:12 -07:00
|
|
|
#define foo {3:void} main() { \ |
|
|
|
|
{4:return} {5:42}; \ |
|
|
|
|
} |
|
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*11
|
2021-01-03 06:38:12 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
2021-03-29 13:07:21 -07:00
|
|
|
|
|
|
|
it('supports highlighting with custom highlight groups', function()
|
2023-04-30 08:11:38 -07:00
|
|
|
insert(hl_text_c)
|
2021-03-29 13:07:21 -07:00
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c")
|
|
|
|
test_hl = vim.treesitter.highlighter.new(parser, {queries = {c = hl_query}})
|
|
|
|
]]
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queue} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} |
|
|
|
|
|| {6:lstate} != {6:lstate}) { |
|
|
|
|
{11:lua_pushliteral}(lstate, {5:"vim.schedule: expected function"}); |
|
|
|
|
{4:return} {11:lua_error}(lstate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
^} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*2
|
2021-03-29 13:07:21 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
-- This will change ONLY the literal strings to look like comments
|
|
|
|
-- The only literal string is the "vim.schedule: expected function" in this test.
|
2022-08-24 14:48:52 -07:00
|
|
|
exec_lua [[vim.cmd("highlight link @string.nonexistent_specializer comment")]]
|
2021-03-29 13:07:21 -07:00
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:/// Schedule Lua callback on main loop's event queue} |
|
|
|
|
{3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
|
|
|
|
{ |
|
|
|
|
{4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} |
|
|
|
|
|| {6:lstate} != {6:lstate}) { |
|
|
|
|
{11:lua_pushliteral}(lstate, {2:"vim.schedule: expected function"}); |
|
|
|
|
{4:return} {11:lua_error}(lstate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
{7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
|
|
|
|
|
|
|
|
|
multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
|
|
|
|
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
|
|
|
|
{4:return} {5:0}; |
|
|
|
|
^} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*2
|
2021-03-29 13:07:21 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
screen:expect { unchanged = true }
|
|
|
|
end)
|
2021-07-17 05:41:17 -07:00
|
|
|
|
|
|
|
it('supports highlighting with priority', function()
|
|
|
|
insert([[
|
|
|
|
int x = INT_MAX;
|
2023-04-02 01:11:42 -07:00
|
|
|
#define READ_STRING(x, y) (char *)read_string((x), (size_t)(y))
|
2021-07-17 05:41:17 -07:00
|
|
|
#define foo void main() { \
|
|
|
|
return 42; \
|
|
|
|
}
|
|
|
|
]])
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c")
|
2023-04-01 03:11:24 -07:00
|
|
|
test_hl = vim.treesitter.highlighter.new(parser, {queries = {c = hl_query..'\n((translation_unit) @constant (#set! "priority" 101))\n'}})
|
2021-07-17 05:41:17 -07:00
|
|
|
]]
|
2023-04-01 03:11:24 -07:00
|
|
|
-- expect everything to have Constant highlight
|
2021-07-17 05:41:17 -07:00
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{12:int}{8: x = INT_MAX;} |
|
2023-08-12 09:12:49 -07:00
|
|
|
{8:#define READ_STRING(x, y) (}{12:char}{8: *)read_string((x), (}{12:size_t}{8:)(y))} |
|
|
|
|
{8:#define foo }{12:void}{8: main() { \} |
|
|
|
|
{8: }{12:return}{8: 42; \} |
|
2021-07-17 05:41:17 -07:00
|
|
|
{8: }} |
|
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*11
|
2021-07-17 05:41:17 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
attr_ids = {
|
|
|
|
[1] = { bold = true, foreground = Screen.colors.Blue1 },
|
2023-04-01 03:11:24 -07:00
|
|
|
[8] = { foreground = Screen.colors.Magenta1 },
|
2021-07-17 05:41:17 -07:00
|
|
|
-- bold will not be overwritten at the moment
|
2023-04-01 03:11:24 -07:00
|
|
|
[12] = { bold = true, foreground = Screen.colors.Magenta1 },
|
2024-01-02 18:09:18 -07:00
|
|
|
},
|
2021-07-17 05:41:17 -07:00
|
|
|
}
|
2022-08-25 12:41:52 -07:00
|
|
|
|
|
|
|
eq({
|
2023-04-01 03:11:24 -07:00
|
|
|
{ capture = 'constant', metadata = { priority = '101' }, lang = 'c' },
|
2022-12-14 02:46:54 -07:00
|
|
|
{ capture = 'type', metadata = {}, lang = 'c' },
|
2022-09-24 15:45:15 -07:00
|
|
|
}, exec_lua [[ return vim.treesitter.get_captures_at_pos(0, 0, 2) ]])
|
2021-07-17 05:41:17 -07:00
|
|
|
end)
|
2022-02-16 11:38:19 -07:00
|
|
|
|
|
|
|
it(
|
|
|
|
"allows to use captures with dots (don't use fallback when specialization of foo exists)",
|
|
|
|
function()
|
|
|
|
insert([[
|
|
|
|
char* x = "Will somebody ever read this?";
|
|
|
|
]])
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
char* x = "Will somebody ever read this?"; |
|
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*15
|
2022-02-16 11:38:19 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
2022-08-24 14:48:52 -07:00
|
|
|
command [[
|
|
|
|
hi link @foo.bar Type
|
|
|
|
hi link @foo String
|
|
|
|
]]
|
2022-02-16 11:38:19 -07:00
|
|
|
exec_lua [[
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c", {})
|
|
|
|
local highlighter = vim.treesitter.highlighter
|
|
|
|
test_hl = highlighter.new(parser, {queries = {c = "(primitive_type) @foo.bar (string_literal) @foo"}})
|
|
|
|
]]
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{3:char}* x = {5:"Will somebody ever read this?"}; |
|
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*15
|
2022-02-16 11:38:19 -07:00
|
|
|
|
|
2022-03-19 05:48:03 -07:00
|
|
|
]],
|
|
|
|
}
|
2022-08-24 14:48:52 -07:00
|
|
|
|
|
|
|
-- clearing specialization reactivates fallback
|
|
|
|
command [[ hi clear @foo.bar ]]
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{5:char}* x = {5:"Will somebody ever read this?"}; |
|
|
|
|
^ |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*15
|
2022-08-24 14:48:52 -07:00
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
2022-03-19 05:48:03 -07:00
|
|
|
end
|
|
|
|
)
|
|
|
|
|
|
|
|
it('supports conceal attribute', function()
|
2023-04-30 08:11:38 -07:00
|
|
|
insert(hl_text_c)
|
2022-03-19 05:48:03 -07:00
|
|
|
|
|
|
|
-- conceal can be empty or a single cchar.
|
|
|
|
exec_lua [=[
|
|
|
|
vim.opt.cole = 2
|
|
|
|
local parser = vim.treesitter.get_parser(0, "c")
|
|
|
|
test_hl = vim.treesitter.highlighter.new(parser, {queries = {c = [[
|
|
|
|
("static" @keyword
|
2024-02-21 11:58:17 -07:00
|
|
|
(#set! conceal "R"))
|
2022-03-19 05:48:03 -07:00
|
|
|
|
|
|
|
((identifier) @Identifier
|
2024-02-21 11:58:17 -07:00
|
|
|
(#set! conceal "")
|
|
|
|
(#eq? @Identifier "lstate"))
|
feat(treesitter): support URLs (#27132)
Tree-sitter queries can add URLs to a capture using the `#set!`
directive, e.g.
(inline_link
(link_text) @text.reference
(link_destination) @text.uri
(#set! @text.reference "url" @text.uri))
The pattern above is included by default in the `markdown_inline`
highlight query so that users with supporting terminals will see
hyperlinks. For now, this creates a hyperlink for *all* Markdown URLs of
the pattern [link text](link url), even if `link url` does not contain
a valid protocol (e.g. if `link url` is a path to a file). We may wish to
change this in the future to only linkify when the URL has a valid
protocol scheme, but for now we delegate handling this to the terminal
emulator.
In order to support directives which reference other nodes, the
highlighter must be updated to use `iter_matches` rather than
`iter_captures`. The former provides the `match` table which maps
capture IDs to nodes. However, this has its own challenges:
- `iter_matches` does not guarantee the order in which patterns are
iterated matches the order in the query file. So we must enforce
ordering manually using "subpriorities" (#27131). The pattern index of
each match dictates the extmark's subpriority.
- When injections are used, the highlighter contains multiple trees. The
pattern indices of each tree must be offset relative to the maximum
pattern index from all previous trees to ensure that extmarks appear
in the correct order.
- The `iter_captures` implementation currently has a bug where the
"match" table is only returned for the first capture within a pattern
(see #27274). This bug means that `#set!` directives in a query
apply only to the first capture within a pattern. Unfortunately, many
queries in the wild have come to depend on this behavior.
`iter_matches` does not share this flaw, so switching to
`iter_matches` exposed bugs in existing highlight queries. These
queries have been updated in this repo, but may still need to be
updated by users. The `#set!` directive applies to the _entire_ query
pattern when used without a capture argument. To make `#set!`
apply only to a single capture, the capture must be given as an
argument.
2024-03-12 07:32:17 -07:00
|
|
|
|
|
|
|
((call_expression
|
|
|
|
function: (identifier) @function
|
|
|
|
arguments: (argument_list) @arguments)
|
|
|
|
(#eq? @function "multiqueue_put")
|
|
|
|
(#set! @function conceal "V"))
|
2022-03-19 05:48:03 -07:00
|
|
|
]]}})
|
|
|
|
]=]
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
/// Schedule Lua callback on main loop's event queue |
|
|
|
|
{4:R} int nlua_schedule(lua_State *const ) |
|
|
|
|
{ |
|
|
|
|
if (lua_type(, 1) != LUA_TFUNCTION |
|
|
|
|
|| != ) { |
|
|
|
|
lua_pushliteral(, "vim.schedule: expected function"); |
|
|
|
|
return lua_error(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
LuaRef cb = nlua_ref(, 1); |
|
|
|
|
|
|
feat(treesitter): support URLs (#27132)
Tree-sitter queries can add URLs to a capture using the `#set!`
directive, e.g.
(inline_link
(link_text) @text.reference
(link_destination) @text.uri
(#set! @text.reference "url" @text.uri))
The pattern above is included by default in the `markdown_inline`
highlight query so that users with supporting terminals will see
hyperlinks. For now, this creates a hyperlink for *all* Markdown URLs of
the pattern [link text](link url), even if `link url` does not contain
a valid protocol (e.g. if `link url` is a path to a file). We may wish to
change this in the future to only linkify when the URL has a valid
protocol scheme, but for now we delegate handling this to the terminal
emulator.
In order to support directives which reference other nodes, the
highlighter must be updated to use `iter_matches` rather than
`iter_captures`. The former provides the `match` table which maps
capture IDs to nodes. However, this has its own challenges:
- `iter_matches` does not guarantee the order in which patterns are
iterated matches the order in the query file. So we must enforce
ordering manually using "subpriorities" (#27131). The pattern index of
each match dictates the extmark's subpriority.
- When injections are used, the highlighter contains multiple trees. The
pattern indices of each tree must be offset relative to the maximum
pattern index from all previous trees to ensure that extmarks appear
in the correct order.
- The `iter_captures` implementation currently has a bug where the
"match" table is only returned for the first capture within a pattern
(see #27274). This bug means that `#set!` directives in a query
apply only to the first capture within a pattern. Unfortunately, many
queries in the wild have come to depend on this behavior.
`iter_matches` does not share this flaw, so switching to
`iter_matches` exposed bugs in existing highlight queries. These
queries have been updated in this repo, but may still need to be
updated by users. The `#set!` directive applies to the _entire_ query
pattern when used without a capture argument. To make `#set!`
apply only to a single capture, the capture must be given as an
argument.
2024-03-12 07:32:17 -07:00
|
|
|
{11:V}(main_loop.events, nlua_schedule_event, |
|
2022-03-19 05:48:03 -07:00
|
|
|
1, (void *)(ptrdiff_t)cb); |
|
|
|
|
return 0; |
|
|
|
|
^} |
|
2023-12-09 05:42:00 -07:00
|
|
|
{1:~ }|*2
|
2022-03-19 05:48:03 -07:00
|
|
|
|
|
2022-02-16 11:38:19 -07:00
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
2022-08-24 14:48:52 -07:00
|
|
|
it('@foo.bar groups has the correct fallback behavior', function()
|
|
|
|
local get_hl = function(name)
|
2024-01-12 10:59:57 -07:00
|
|
|
return api.nvim_get_hl_by_name(name, 1).foreground
|
2022-08-24 14:48:52 -07:00
|
|
|
end
|
2024-01-12 10:59:57 -07:00
|
|
|
api.nvim_set_hl(0, '@foo', { fg = 1 })
|
|
|
|
api.nvim_set_hl(0, '@foo.bar', { fg = 2 })
|
|
|
|
api.nvim_set_hl(0, '@foo.bar.baz', { fg = 3 })
|
2024-01-02 18:09:18 -07:00
|
|
|
|
2022-08-24 14:48:52 -07:00
|
|
|
eq(1, get_hl '@foo')
|
|
|
|
eq(1, get_hl '@foo.a.b.c.d')
|
|
|
|
eq(2, get_hl '@foo.bar')
|
|
|
|
eq(2, get_hl '@foo.bar.a.b.c.d')
|
|
|
|
eq(3, get_hl '@foo.bar.baz')
|
|
|
|
eq(3, get_hl '@foo.bar.baz.d')
|
|
|
|
|
|
|
|
-- lookup is case insensitive
|
|
|
|
eq(2, get_hl '@FOO.BAR.SPAM')
|
|
|
|
|
2024-01-12 10:59:57 -07:00
|
|
|
api.nvim_set_hl(0, '@foo.missing.exists', { fg = 3 })
|
2022-08-24 14:48:52 -07:00
|
|
|
eq(1, get_hl '@foo.missing')
|
|
|
|
eq(3, get_hl '@foo.missing.exists')
|
|
|
|
eq(3, get_hl '@foo.missing.exists.bar')
|
|
|
|
eq(nil, get_hl '@total.nonsense.but.a.lot.of.dots')
|
2022-02-16 11:38:19 -07:00
|
|
|
end)
|
2024-02-16 10:54:47 -07:00
|
|
|
|
|
|
|
it('supports multiple nodes assigned to the same capture #17060', function()
|
|
|
|
insert([[
|
|
|
|
int x = 4;
|
|
|
|
int y = 5;
|
|
|
|
int z = 6;
|
|
|
|
]])
|
|
|
|
|
|
|
|
exec_lua([[
|
|
|
|
local query = '((declaration)+ @string)'
|
|
|
|
vim.treesitter.query.set('c', 'highlights', query)
|
|
|
|
vim.treesitter.highlighter.new(vim.treesitter.get_parser(0, 'c'))
|
|
|
|
]])
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{5:int x = 4;} |
|
|
|
|
{5:int y = 5;} |
|
|
|
|
{5:int z = 6;} |
|
|
|
|
^ |
|
|
|
|
{1:~ }|*13
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
2021-01-03 06:38:12 -07:00
|
|
|
end)
|
2023-04-30 08:11:38 -07:00
|
|
|
|
feat(treesitter): support URLs (#27132)
Tree-sitter queries can add URLs to a capture using the `#set!`
directive, e.g.
(inline_link
(link_text) @text.reference
(link_destination) @text.uri
(#set! @text.reference "url" @text.uri))
The pattern above is included by default in the `markdown_inline`
highlight query so that users with supporting terminals will see
hyperlinks. For now, this creates a hyperlink for *all* Markdown URLs of
the pattern [link text](link url), even if `link url` does not contain
a valid protocol (e.g. if `link url` is a path to a file). We may wish to
change this in the future to only linkify when the URL has a valid
protocol scheme, but for now we delegate handling this to the terminal
emulator.
In order to support directives which reference other nodes, the
highlighter must be updated to use `iter_matches` rather than
`iter_captures`. The former provides the `match` table which maps
capture IDs to nodes. However, this has its own challenges:
- `iter_matches` does not guarantee the order in which patterns are
iterated matches the order in the query file. So we must enforce
ordering manually using "subpriorities" (#27131). The pattern index of
each match dictates the extmark's subpriority.
- When injections are used, the highlighter contains multiple trees. The
pattern indices of each tree must be offset relative to the maximum
pattern index from all previous trees to ensure that extmarks appear
in the correct order.
- The `iter_captures` implementation currently has a bug where the
"match" table is only returned for the first capture within a pattern
(see #27274). This bug means that `#set!` directives in a query
apply only to the first capture within a pattern. Unfortunately, many
queries in the wild have come to depend on this behavior.
`iter_matches` does not share this flaw, so switching to
`iter_matches` exposed bugs in existing highlight queries. These
queries have been updated in this repo, but may still need to be
updated by users. The `#set!` directive applies to the _entire_ query
pattern when used without a capture argument. To make `#set!`
apply only to a single capture, the capture must be given as an
argument.
2024-03-12 07:32:17 -07:00
|
|
|
describe('treesitter highlighting (lua)', function()
|
|
|
|
local screen
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
screen = Screen.new(65, 18)
|
|
|
|
screen:attach()
|
|
|
|
screen:set_default_attr_ids {
|
|
|
|
[1] = { bold = true, foreground = Screen.colors.Blue },
|
|
|
|
[2] = { foreground = Screen.colors.DarkCyan },
|
|
|
|
[3] = { foreground = Screen.colors.Magenta },
|
|
|
|
[4] = { foreground = Screen.colors.SlateBlue },
|
|
|
|
[5] = { bold = true, foreground = Screen.colors.Brown },
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('supports language injections', function()
|
|
|
|
insert [[
|
|
|
|
local ffi = require('ffi')
|
|
|
|
ffi.cdef("int (*fun)(int, char *);")
|
|
|
|
]]
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
vim.bo.filetype = 'lua'
|
|
|
|
vim.treesitter.start()
|
|
|
|
]]
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{5:local} {2:ffi} {5:=} {4:require(}{3:'ffi'}{4:)} |
|
|
|
|
{2:ffi}{4:.}{2:cdef}{4:(}{3:"}{4:int}{3: }{4:(}{5:*}{3:fun}{4:)(int,}{3: }{4:char}{3: }{5:*}{4:);}{3:"}{4:)} |
|
|
|
|
^ |
|
|
|
|
{1:~ }|*14
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
end)
|
|
|
|
|
2023-04-30 08:11:38 -07:00
|
|
|
describe('treesitter highlighting (help)', function()
|
|
|
|
local screen
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
screen = Screen.new(40, 6)
|
|
|
|
screen:attach()
|
|
|
|
screen:set_default_attr_ids {
|
|
|
|
[1] = { foreground = Screen.colors.Blue1 },
|
|
|
|
[2] = { bold = true, foreground = Screen.colors.Blue1 },
|
|
|
|
[3] = { bold = true, foreground = Screen.colors.Brown },
|
|
|
|
[4] = { foreground = Screen.colors.Cyan4 },
|
|
|
|
[5] = { foreground = Screen.colors.Magenta1 },
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('correctly redraws added/removed injections', function()
|
|
|
|
insert [[
|
|
|
|
>ruby
|
|
|
|
-- comment
|
|
|
|
local this_is = 'actually_lua'
|
|
|
|
<
|
|
|
|
]]
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
vim.bo.filetype = 'help'
|
|
|
|
vim.treesitter.start()
|
|
|
|
]]
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
2024-01-25 04:28:26 -07:00
|
|
|
{1:>ruby} |
|
|
|
|
{1: -- comment} |
|
|
|
|
{1: local this_is = 'actually_lua'} |
|
|
|
|
{1:<} |
|
2023-04-30 08:11:38 -07:00
|
|
|
^ |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
2024-01-12 10:59:57 -07:00
|
|
|
helpers.api.nvim_buf_set_text(0, 0, 1, 0, 5, { 'lua' })
|
2023-04-30 08:11:38 -07:00
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
2024-01-25 04:28:26 -07:00
|
|
|
{1:>lua} |
|
|
|
|
{1: -- comment} |
|
|
|
|
{1: }{3:local}{1: }{4:this_is}{1: }{3:=}{1: }{5:'actually_lua'} |
|
|
|
|
{1:<} |
|
2023-04-30 08:11:38 -07:00
|
|
|
^ |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
2024-01-12 10:59:57 -07:00
|
|
|
helpers.api.nvim_buf_set_text(0, 0, 1, 0, 4, { 'ruby' })
|
2023-04-30 08:11:38 -07:00
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
2024-01-25 04:28:26 -07:00
|
|
|
{1:>ruby} |
|
|
|
|
{1: -- comment} |
|
|
|
|
{1: local this_is = 'actually_lua'} |
|
|
|
|
{1:<} |
|
2023-04-30 08:11:38 -07:00
|
|
|
^ |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
2024-03-13 07:40:41 -07:00
|
|
|
|
|
|
|
it('correctly redraws injections subpriorities', function()
|
|
|
|
-- The top level string node will be highlighted first
|
|
|
|
-- with an extmark spanning multiple lines.
|
|
|
|
-- When the next line is drawn, which includes an injection,
|
|
|
|
-- make sure the highlight appears above the base tree highlight
|
|
|
|
|
|
|
|
insert([=[
|
|
|
|
local s = [[
|
|
|
|
local also = lua
|
|
|
|
]]
|
|
|
|
]=])
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
parser = vim.treesitter.get_parser(0, "lua", {
|
|
|
|
injections = {
|
|
|
|
lua = '(string content: (_) @injection.content (#set! injection.language lua))'
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
vim.treesitter.highlighter.new(parser)
|
|
|
|
]]
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [=[
|
|
|
|
{3:local} {4:s} {3:=} {5:[[} |
|
|
|
|
{5: }{3:local}{5: }{4:also}{5: }{3:=}{5: }{4:lua} |
|
|
|
|
{5:]]} |
|
|
|
|
^ |
|
|
|
|
{2:~ }|
|
|
|
|
|
|
|
|
|
]=],
|
|
|
|
}
|
|
|
|
end)
|
2023-04-30 08:11:38 -07:00
|
|
|
end)
|
fix(languagetree): don't treat unparsed nodes as occupying full range
This is incorrect in the following scenario:
1. The language tree is Lua > Vim > Lua.
2. An edit simultaneously wipes out the `_regions` of all nodes, while
taking the Vim injection off-screen.
3. The Vim injection is not re-parsed, so the child Lua `_regions` is
still `nil`.
4. The child Lua is assumed, incorrectly, to occupy the whole document.
5. This causes the injections to be parsed again, resulting in Lua > Vim
> Lua > Vim.
6. Now, by the same process, Vim ends up with its range assumed over the
whole document. Now the parse is broken and results in broken
highlighting and poor performance.
It should be fine to instead treat an unparsed node as occupying
nothing (i.e. effectively non-existent). Since, either:
- The parent was just parsed, hence defining `_regions`
- The parent was not just parsed, in which case this node doesn't need
to be parsed either.
Also, the name `has_regions` is confusing; it seems to simply
mean the opposite of "root" or "full_document". However, this PR does
not touch it.
2023-09-19 21:41:07 -07:00
|
|
|
|
|
|
|
describe('treesitter highlighting (nested injections)', function()
|
|
|
|
local screen
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
screen = Screen.new(80, 7)
|
|
|
|
screen:attach()
|
|
|
|
screen:set_default_attr_ids {
|
|
|
|
[1] = { foreground = Screen.colors.SlateBlue },
|
|
|
|
[2] = { bold = true, foreground = Screen.colors.Brown },
|
|
|
|
[3] = { foreground = Screen.colors.Cyan4 },
|
|
|
|
[4] = { foreground = Screen.colors.Fuchsia },
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('correctly redraws nested injections (GitHub #25252)', function()
|
|
|
|
insert [=[
|
|
|
|
function foo() print("Lua!") end
|
|
|
|
|
|
|
|
local lorem = {
|
|
|
|
ipsum = {},
|
|
|
|
bar = {},
|
|
|
|
}
|
|
|
|
vim.cmd([[
|
|
|
|
augroup RustLSP
|
|
|
|
autocmd CursorHold silent! lua vim.lsp.buf.document_highlight()
|
|
|
|
augroup END
|
|
|
|
]])
|
|
|
|
]=]
|
|
|
|
|
|
|
|
exec_lua [[
|
|
|
|
vim.opt.scrolloff = 0
|
|
|
|
vim.bo.filetype = 'lua'
|
|
|
|
vim.treesitter.start()
|
|
|
|
]]
|
|
|
|
|
|
|
|
-- invalidate the language tree
|
|
|
|
feed('ggi--[[<ESC>04x')
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:^function} {3:foo}{1:()} {1:print(}{4:"Lua!"}{1:)} {2:end} |
|
|
|
|
|
|
|
|
|
{2:local} {3:lorem} {2:=} {1:{} |
|
|
|
|
{3:ipsum} {2:=} {1:{},} |
|
|
|
|
{3:bar} {2:=} {1:{},} |
|
|
|
|
{1:}} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
|
|
|
|
-- spam newline insert/delete to invalidate Lua > Vim > Lua region
|
|
|
|
feed('3jo<ESC>ddko<ESC>ddko<ESC>ddko<ESC>ddk0')
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{2:function} {3:foo}{1:()} {1:print(}{4:"Lua!"}{1:)} {2:end} |
|
|
|
|
|
|
|
|
|
{2:local} {3:lorem} {2:=} {1:{} |
|
|
|
|
^ {3:ipsum} {2:=} {1:{},} |
|
|
|
|
{3:bar} {2:=} {1:{},} |
|
|
|
|
{1:}} |
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
end)
|
feat(treesitter): support URLs (#27132)
Tree-sitter queries can add URLs to a capture using the `#set!`
directive, e.g.
(inline_link
(link_text) @text.reference
(link_destination) @text.uri
(#set! @text.reference "url" @text.uri))
The pattern above is included by default in the `markdown_inline`
highlight query so that users with supporting terminals will see
hyperlinks. For now, this creates a hyperlink for *all* Markdown URLs of
the pattern [link text](link url), even if `link url` does not contain
a valid protocol (e.g. if `link url` is a path to a file). We may wish to
change this in the future to only linkify when the URL has a valid
protocol scheme, but for now we delegate handling this to the terminal
emulator.
In order to support directives which reference other nodes, the
highlighter must be updated to use `iter_matches` rather than
`iter_captures`. The former provides the `match` table which maps
capture IDs to nodes. However, this has its own challenges:
- `iter_matches` does not guarantee the order in which patterns are
iterated matches the order in the query file. So we must enforce
ordering manually using "subpriorities" (#27131). The pattern index of
each match dictates the extmark's subpriority.
- When injections are used, the highlighter contains multiple trees. The
pattern indices of each tree must be offset relative to the maximum
pattern index from all previous trees to ensure that extmarks appear
in the correct order.
- The `iter_captures` implementation currently has a bug where the
"match" table is only returned for the first capture within a pattern
(see #27274). This bug means that `#set!` directives in a query
apply only to the first capture within a pattern. Unfortunately, many
queries in the wild have come to depend on this behavior.
`iter_matches` does not share this flaw, so switching to
`iter_matches` exposed bugs in existing highlight queries. These
queries have been updated in this repo, but may still need to be
updated by users. The `#set!` directive applies to the _entire_ query
pattern when used without a capture argument. To make `#set!`
apply only to a single capture, the capture must be given as an
argument.
2024-03-12 07:32:17 -07:00
|
|
|
|
|
|
|
describe('treesitter highlighting (markdown)', function()
|
|
|
|
local screen
|
|
|
|
|
|
|
|
before_each(function()
|
|
|
|
screen = Screen.new(40, 6)
|
|
|
|
screen:attach()
|
|
|
|
screen:set_default_attr_ids {
|
|
|
|
[1] = { foreground = Screen.colors.Blue1 },
|
|
|
|
[2] = { bold = true, foreground = Screen.colors.Blue1 },
|
|
|
|
[3] = { bold = true, foreground = Screen.colors.Brown },
|
|
|
|
[4] = { foreground = Screen.colors.Cyan4 },
|
|
|
|
[5] = { foreground = Screen.colors.Magenta1 },
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('supports hyperlinks', function()
|
|
|
|
local url = 'https://example.com'
|
|
|
|
insert(string.format('[This link text](%s) is a hyperlink.', url))
|
|
|
|
exec_lua([[
|
|
|
|
vim.bo.filetype = 'markdown'
|
|
|
|
vim.treesitter.start()
|
|
|
|
]])
|
|
|
|
|
|
|
|
screen:expect {
|
|
|
|
grid = [[
|
|
|
|
{4:[}{6:This link text}{4:](}{7:https://example.com}{4:)} is|
|
|
|
|
a hyperlink^. |
|
|
|
|
{2:~ }|*3
|
|
|
|
|
|
|
|
|
]],
|
|
|
|
attr_ids = {
|
|
|
|
[1] = { foreground = Screen.colors.Blue1 },
|
|
|
|
[2] = { bold = true, foreground = Screen.colors.Blue1 },
|
|
|
|
[3] = { bold = true, foreground = Screen.colors.Brown },
|
|
|
|
[4] = { foreground = Screen.colors.Cyan4 },
|
|
|
|
[5] = { foreground = Screen.colors.Magenta },
|
|
|
|
[6] = { foreground = Screen.colors.Cyan4, url = url },
|
|
|
|
[7] = { underline = true, foreground = Screen.colors.SlateBlue },
|
|
|
|
},
|
|
|
|
}
|
|
|
|
end)
|
|
|
|
end)
|