mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-09 20:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

treesitter: add contains? predicate

Browse Source
This commit is contained in:
Thomas Vigouroux
2020-08-10 09:41:57 +02:00
parent 18c0e77528
commit 58e37d7df8
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/lua/vim/treesitter/query.lua
View File

@@ -65,6 +65,19 @@ local predicate_handlers = {
return string.find(get_node_text(node, bufnr), regex) return string.find(get_node_text(node, bufnr), regex)
end, end,
["contains?"] = function(match, _, bufnr, predicate)
local node = match[predicate[2]]
local node_text = get_node_text(node, bufnr)
for i=3,#predicate do
if string.find(node_text, predicate[i], 1, true) then
return true
end
end
return false
end
} }
--- Adds a new predicates to be used in queries --- Adds a new predicates to be used in queries

35
test/functional/lua/treesitter_spec.lua
View File

@@ -243,9 +243,8 @@ static int nlua_schedule(lua_State *const lstate)
(primitive_type) @type (primitive_type) @type
(sized_type_specifier) @type (sized_type_specifier) @type
; defaults to very magic syntax, for best compatibility ; Use lua regexes
((identifier) @Identifier (#match? @Identifier "^l(u)a_")) ((identifier) @Identifier (#contains? @Identifier "lua_"))
; still support \M etc prefixes
((identifier) @Constant (#match? @Constant "^[A-Z_]+$")) ((identifier) @Constant (#match? @Constant "^[A-Z_]+$"))
((binary_expression left: (identifier) @WarningMsg.left right: (identifier) @WarningMsg.right) (#eq? @WarningMsg.left @WarningMsg.right)) ((binary_expression left: (identifier) @WarningMsg.left right: (identifier) @WarningMsg.right) (#eq? @WarningMsg.left @WarningMsg.right))
@@ -298,7 +297,7 @@ static int nlua_schedule(lua_State *const lstate)
]], hl_query) ]], hl_query)
screen:expect{grid=[[ screen:expect{grid=[[
{2:/// Schedule Lua callback on main loop's event queue} | {2:/// Schedule Lua callback on main loop's event queue} |
{3:static} {3:int} nlua_schedule({3:lua_State} *{3:const} lstate) | {3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
{ | { |
{4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} | {4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} |
|| {6:lstate} != {6:lstate}) { | || {6:lstate} != {6:lstate}) { |
@@ -306,9 +305,9 @@ static int nlua_schedule(lua_State *const lstate)
{4:return} {11:lua_error}(lstate); | {4:return} {11:lua_error}(lstate); |
} | } |
| |
{7:LuaRef} cb = nlua_ref(lstate, {5:1}); | {7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
| |
multiqueue_put(main_loop.events, nlua_schedule_event, | multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); | {5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
{4:return} {5:0}; | {4:return} {5:0}; |
^} | ^} |
@@ -320,7 +319,7 @@ static int nlua_schedule(lua_State *const lstate)
feed('7Go*/<esc>') feed('7Go*/<esc>')
screen:expect{grid=[[ screen:expect{grid=[[
{2:/// Schedule Lua callback on main loop's event queue} | {2:/// Schedule Lua callback on main loop's event queue} |
{3:static} {3:int} nlua_schedule({3:lua_State} *{3:const} lstate) | {3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
{ | { |
{4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} | {4:if} ({11:lua_type}(lstate, {5:1}) != {5:LUA_TFUNCTION} |
|| {6:lstate} != {6:lstate}) { | || {6:lstate} != {6:lstate}) { |
@@ -329,9 +328,9 @@ static int nlua_schedule(lua_State *const lstate)
{8:*^/} | {8:*^/} |
} | } |
| |
{7:LuaRef} cb = nlua_ref(lstate, {5:1}); | {7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
| |
multiqueue_put(main_loop.events, nlua_schedule_event, | multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); | {5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
{4:return} {5:0}; | {4:return} {5:0}; |
} | } |
@@ -342,7 +341,7 @@ static int nlua_schedule(lua_State *const lstate)
feed('3Go/*<esc>') feed('3Go/*<esc>')
screen:expect{grid=[[ screen:expect{grid=[[
{2:/// Schedule Lua callback on main loop's event queue} | {2:/// Schedule Lua callback on main loop's event queue} |
{3:static} {3:int} nlua_schedule({3:lua_State} *{3:const} lstate) | {3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
{ | { |
{2:/^*} | {2:/^*} |
{2: if (lua_type(lstate, 1) != LUA_TFUNCTION} | {2: if (lua_type(lstate, 1) != LUA_TFUNCTION} |
@@ -352,9 +351,9 @@ static int nlua_schedule(lua_State *const lstate)
{2:*/} | {2:*/} |
} | } |
| |
{7:LuaRef} cb = nlua_ref(lstate, {5:1}); | {7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
| |
multiqueue_put(main_loop.events, nlua_schedule_event, | multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); | {5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
{4:return} {5:0}; | {4:return} {5:0}; |
{8:}} | {8:}} |
@@ -365,7 +364,7 @@ static int nlua_schedule(lua_State *const lstate)
feed("~") feed("~")
screen:expect{grid=[[ screen:expect{grid=[[
{2:/// Schedule Lua callback on main loop's event queu^E} | {2:/// Schedule Lua callback on main loop's event queu^E} |
{3:static} {3:int} nlua_schedule({3:lua_State} *{3:const} lstate) | {3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
{ | { |
{2:/*} | {2:/*} |
{2: if (lua_type(lstate, 1) != LUA_TFUNCTION} | {2: if (lua_type(lstate, 1) != LUA_TFUNCTION} |
@@ -375,9 +374,9 @@ static int nlua_schedule(lua_State *const lstate)
{2:*/} | {2:*/} |
} | } |
| |
{7:LuaRef} cb = nlua_ref(lstate, {5:1}); | {7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
| |
multiqueue_put(main_loop.events, nlua_schedule_event, | multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); | {5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
{4:return} {5:0}; | {4:return} {5:0}; |
{8:}} | {8:}} |
@@ -388,7 +387,7 @@ static int nlua_schedule(lua_State *const lstate)
feed("re") feed("re")
screen:expect{grid=[[ screen:expect{grid=[[
{2:/// Schedule Lua callback on main loop's event queu^e} | {2:/// Schedule Lua callback on main loop's event queu^e} |
{3:static} {3:int} nlua_schedule({3:lua_State} *{3:const} lstate) | {3:static} {3:int} {11:nlua_schedule}({3:lua_State} *{3:const} lstate) |
{ | { |
{2:/*} | {2:/*} |
{2: if (lua_type(lstate, 1) != LUA_TFUNCTION} | {2: if (lua_type(lstate, 1) != LUA_TFUNCTION} |
@@ -398,9 +397,9 @@ static int nlua_schedule(lua_State *const lstate)
{2:*/} | {2:*/} |
} | } |
| |
{7:LuaRef} cb = nlua_ref(lstate, {5:1}); | {7:LuaRef} cb = {11:nlua_ref}(lstate, {5:1}); |
| |
multiqueue_put(main_loop.events, nlua_schedule_event, | multiqueue_put(main_loop.events, {11:nlua_schedule_event}, |
{5:1}, ({3:void} *)({3:ptrdiff_t})cb); | {5:1}, ({3:void} *)({3:ptrdiff_t})cb); |
{4:return} {5:0}; | {4:return} {5:0}; |
{8:}} | {8:}} |