Michael Sloan
b564b1d5d0
An alternative might be to adjust the logic to not nest items when their ranges are the same, but then clicking them doesn't work properly / moving the cursor does not change which is selected. This could probably be made to work with some extra logic there, but it seems overkill. The downside of fixing it at the query level is that other parts of the declaration are not inside the item range. This seems to be fine for single line declarations - the nearest outline item is highlighted. However, if a part of the declaration is not included in an item range and is on its own line, then no outline item is highlighted. Release Notes: - Outline Panel: Fixed nesting of var and field declarations with multiple identifiers in Go and C++ C++ before: <img width="743" height="227" alt="image" src="https://github.com/user-attachments/assets/af1a1d76-ecdc-4999-ae9c-95591726ccca" /> C++ after: <img width="795" height="250" alt="image" src="https://github.com/user-attachments/assets/49667ed3-e088-48b3-a9f0-6a119b5e7648" /> Go before: <img width="859" height="306" alt="image" src="https://github.com/user-attachments/assets/ecc7530a-ca16-4f37-b8d1-60687f178b12" /> Go after: <img width="900" height="334" alt="image" src="https://github.com/user-attachments/assets/d741cfb0-59e5-4d27-bd6a-f422204dc972" />
158 lines
4.5 KiB
Scheme
158 lines
4.5 KiB
Scheme
(preproc_def
|
|
"#define" @context
|
|
name: (_) @name) @item
|
|
|
|
(preproc_function_def
|
|
"#define" @context
|
|
name: (_) @name
|
|
parameters: (preproc_params
|
|
"(" @context
|
|
")" @context)) @item
|
|
|
|
(type_definition
|
|
"typedef" @context
|
|
declarator: (_) @name) @item
|
|
|
|
(struct_specifier
|
|
"struct" @context
|
|
name: (_) @name) @item
|
|
|
|
(class_specifier
|
|
"class" @context
|
|
name: (_) @name) @item
|
|
|
|
(enum_specifier
|
|
"enum" @context
|
|
name: (_) @name) @item
|
|
|
|
(enumerator
|
|
name: (_) @name) @item
|
|
|
|
(concept_definition
|
|
"concept" @context
|
|
name: (_) @name) @item
|
|
|
|
(declaration
|
|
(storage_class_specifier) @context
|
|
(type_qualifier)? @context
|
|
type: (_) @context
|
|
declarator: (init_declarator
|
|
declarator: (_) @name)) @item
|
|
|
|
(function_definition
|
|
(type_qualifier)? @context
|
|
type: (_)? @context
|
|
declarator: [
|
|
(function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context))
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context)))
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (pointer_declarator
|
|
"*" @context
|
|
declarator: (function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context))))
|
|
(reference_declarator
|
|
["&" "&&"] @context
|
|
(function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context)))
|
|
]
|
|
(type_qualifier)? @context) @item
|
|
|
|
(declaration
|
|
(type_qualifier)? @context
|
|
type: (_)? @context
|
|
declarator: [
|
|
(field_identifier) @name
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (field_identifier) @name)
|
|
(function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context))
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context)))
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (pointer_declarator
|
|
"*" @context
|
|
declarator: (function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context))))
|
|
(reference_declarator
|
|
["&" "&&"] @context
|
|
(function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context)))
|
|
]
|
|
(type_qualifier)? @context) @item
|
|
|
|
(field_declaration
|
|
(type_qualifier)? @context
|
|
type: (_) @context
|
|
declarator: [
|
|
(field_identifier) @name
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (field_identifier) @name)
|
|
(function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context))
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context)))
|
|
(pointer_declarator
|
|
"*" @context
|
|
declarator: (pointer_declarator
|
|
"*" @context
|
|
declarator: (function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context))))
|
|
(reference_declarator
|
|
["&" "&&"] @context
|
|
(function_declarator
|
|
declarator: (_) @name
|
|
parameters: (parameter_list
|
|
"(" @context
|
|
")" @context)))
|
|
; Fields declarations may define multiple fields, and so @item is on the
|
|
; declarator so they each get distinct ranges.
|
|
] @item
|
|
(type_qualifier)? @context)
|
|
|
|
(comment) @annotation
|