Unnamed repository; edit this file 'description' to name the repository.
-rw-r--r--runtime/queries/go/highlights.scm5
-rw-r--r--runtime/queries/go/locals.scm10
2 files changed, 5 insertions, 10 deletions
diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 32c6c2cb..485b5cb8 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -7,16 +7,13 @@
(package_identifier) @namespace
-(parameter_declaration (identifier) @variable.parameter)
-(variadic_parameter_declaration (identifier) @variable.parameter)
-
(const_spec
name: (identifier) @constant)
(type_spec
name: (type_identifier) @constructor)
-(keyed_element (literal_element (identifier) @variable.other.member))
+(keyed_element . (literal_element (identifier) @variable.other.member))
(field_declaration
name: (field_identifier) @variable.other.member)
diff --git a/runtime/queries/go/locals.scm b/runtime/queries/go/locals.scm
index 305c25cd..070667ca 100644
--- a/runtime/queries/go/locals.scm
+++ b/runtime/queries/go/locals.scm
@@ -8,10 +8,6 @@
; Definitions
-(type_parameter_list
- (parameter_declaration
- name: (identifier) @local.definition.variable.parameter))
-
(parameter_declaration (identifier) @local.definition.variable.parameter)
(variadic_parameter_declaration (identifier) @local.definition.variable.parameter)
@@ -22,5 +18,7 @@
; References
(identifier) @local.reference
-(field_identifier) @local.reference
-(type_identifier) @local.reference
+
+; Field names in struct literals are identifier rather than field_identifier,
+; these cannot be locals.
+(keyed_element . (literal_element (identifier) @variable.other.member))