Skip to content

Commit

Permalink
ref(luasnip): move go's treesitter query
Browse files Browse the repository at this point in the history
  • Loading branch information
arsham committed Jul 16, 2022
1 parent 9427e9a commit ea45ae5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 22 deletions.
5 changes: 5 additions & 0 deletions after/queries/go/luasnip.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[
(method_declaration result: (_) @id)
(function_declaration result: (_) @id)
(func_literal result: (_) @id)
]
23 changes: 1 addition & 22 deletions lua/settings/luasnip/util.lua
Original file line number Diff line number Diff line change
Expand Up @@ -124,28 +124,7 @@ local handlers = { --{{{
end,
} --}}}

local query_is_set = false

local function set_query()
if query_is_set then
return
end
query_is_set = true
vim.treesitter.set_query( --{{{
"go",
"LuaSnip_Result",
[[
[
(method_declaration result: (_) @id)
(function_declaration result: (_) @id)
(func_literal result: (_) @id)
]
]]
) --}}}
end

local function return_value_nodes(info) --{{{
set_query()
local cursor_node = ts_utils.get_node_at_cursor()
local scope_tree = ts_locals.get_scope_tree(cursor_node, 0)

Expand All @@ -165,7 +144,7 @@ local function return_value_nodes(info) --{{{
return
end

local query = vim.treesitter.get_query("go", "LuaSnip_Result")
local query = vim.treesitter.get_query("go", "luasnip")
for _, node in query:iter_captures(function_node, 0) do
if handlers[node:type()] then
return handlers[node:type()](node, info)
Expand Down

0 comments on commit ea45ae5

Please sign in to comment.