1d26a27afa
Closes #14497 Release Notes: - Fixed outline view for Go to correctly indent types and show missing variables. ---- This PR fixes the tree-sitter query for outlines for Go code. It correctly indents "grouped" `type` declarations. It also fixes missing variables for "grouped" `var` declarations. ### Before: 1. Incorrectly indented types from `G` to `K` and `aliasInt` 2. Missing vars `M` and `N` in outline  ### After: 1. Types no longer indented incorrectly 2. Missing vars `M` and `N` appear in the outline, as expected  ### Caveats: 1. This fix comes from an hour or so of reading about tree-sitter and its query syntax. I'm not an expert. 2. I'm not sure how to test this. I've done manual testing and it appears to works as expected without an regressions.
64 lines
1.2 KiB
Scheme
64 lines
1.2 KiB
Scheme
(comment) @annotation
|
|
(type_declaration
|
|
"type" @context
|
|
[
|
|
(type_spec
|
|
name: (_) @name) @item
|
|
(
|
|
"("
|
|
(type_spec
|
|
name: (_) @name) @item
|
|
")"
|
|
)
|
|
]
|
|
)
|
|
|
|
(function_declaration
|
|
"func" @context
|
|
name: (identifier) @name
|
|
parameters: (parameter_list
|
|
"("
|
|
")")) @item
|
|
|
|
(method_declaration
|
|
"func" @context
|
|
receiver: (parameter_list
|
|
"(" @context
|
|
(parameter_declaration
|
|
name: (_) @name
|
|
type: (_) @context)
|
|
")" @context)
|
|
name: (field_identifier) @name
|
|
parameters: (parameter_list
|
|
"("
|
|
")")) @item
|
|
|
|
(const_declaration
|
|
"const" @context
|
|
(const_spec
|
|
name: (identifier) @name) @item)
|
|
|
|
(source_file
|
|
(var_declaration
|
|
"var" @context
|
|
[
|
|
(var_spec
|
|
name: (identifier) @name) @item
|
|
(var_spec_list
|
|
"("
|
|
(var_spec
|
|
name: (identifier) @name) @item
|
|
")"
|
|
)
|
|
]
|
|
)
|
|
)
|
|
|
|
(method_elem
|
|
name: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context)) @item
|
|
|
|
(field_declaration
|
|
name: (_) @name) @item
|