[mirror] Make your go dev experience better
github.com/olexsmir/gopher.nvim
neovim
golang
fix(struct_tags): edge case with structs declared as var (#99)
* fix(struct_tags): edge case with structs declared as var
* test: test it and fix it
* fixup! test: test it and fix it
* fixup! fix(struct_tags): edge case with structs declared as var
* fixup! test: test it and fix it
authored by
Smirnov Oleksandr
and committed by
Oleksandr Smirnov
969db908
a993ece5
+96
-6
+24
-4
lua/gopher/_utils/ts.lua
+24
-4
lua/gopher/_utils/ts.lua
···
1
1
local ts = {}
2
2
local queries = {
3
3
struct = [[
4
-
(type_spec name: (type_identifier) @_name
5
-
type: (struct_type))
4
+
[(type_spec name: (type_identifier) @_name
5
+
type: (struct_type))
6
+
(var_declaration (var_spec
7
+
name: (identifier) @_name @_var
8
+
type: (struct_type)))
9
+
(short_var_declaration
10
+
left: (expression_list (identifier) @_name @_var)
11
+
right: (expression_list (composite_literal
12
+
type: (struct_type))))]
6
13
]],
7
14
func = [[
8
15
[(function_declaration name: (identifier) @_name)
···
40
47
---@param query vim.treesitter.Query
41
48
---@param node TSNode
42
49
---@param bufnr integer
43
-
---@return {name:string}
50
+
---@return {name:string, is_varstruct:boolean}
44
51
local function get_captures(query, node, bufnr)
45
52
local res = {}
46
53
for _, match, _ in query:iter_matches(node, bufnr) do
···
49
56
if capture_name == "_name" then
50
57
res["name"] = vim.treesitter.get_node_text(captured_node, bufnr)
51
58
end
59
+
60
+
if capture_name == "_var" then
61
+
res["is_varstruct"] = true
62
+
end
52
63
end
53
64
end
54
65
···
59
70
---@field name string
60
71
---@field start_line integer
61
72
---@field end_line integer
73
+
---@field is_varstruct boolean
62
74
63
75
---@param bufnr integer
64
76
---@param parent_type string[]
···
93
105
--- should be both type_spec and type_declaration
94
106
--- because in cases like `type ( T struct{}, U strict{} )`
95
107
--- i will be choosing always last struct in the list
96
-
return do_stuff(bufnr, { "type_spec", "type_declaration" }, queries.struct)
108
+
---
109
+
--- var_declaration is for cases like `var x struct{}`
110
+
--- short_var_declaration is for cases like `x := struct{}{}`
111
+
return do_stuff(bufnr, {
112
+
"type_spec",
113
+
"type_declaration",
114
+
"var_declaration",
115
+
"short_var_declaration",
116
+
}, queries.struct)
97
117
end
98
118
99
119
---@param bufnr integer