Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'runtime/queries/go/highlights.scm')
-rw-r--r--runtime/queries/go/highlights.scm35
1 files changed, 18 insertions, 17 deletions
diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index be9efeac..0f9be048 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -7,13 +7,16 @@
(package_identifier) @namespace
+(parameter_declaration (identifier) @variable.parameter)
+(variadic_parameter_declaration (identifier) @variable.parameter)
+
(const_spec
name: (identifier) @constant)
-(type_spec
+(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)
@@ -36,14 +39,14 @@
(call_expression
function: (identifier) @function.builtin
- (#match? @function.builtin "^(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover|min|max|clear)$"))
+ (#match? @function.builtin "^(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)$"))
; Types
(type_identifier) @type
(type_parameter_list
- (type_parameter_declaration
+ (parameter_declaration
name: (identifier) @type.parameter))
((type_identifier) @type.builtin
@@ -57,8 +60,9 @@
(method_declaration
name: (field_identifier) @function.method)
-(method_elem
- name: (field_identifier) @function.method)
+(method_spec
+ name: (field_identifier) @function.method)
+
; Operators
@@ -99,8 +103,6 @@
"|"
"|="
"||"
- "&^"
- "&^="
"~"
] @operator
@@ -112,13 +114,7 @@
] @keyword
[
- "defer"
- "go"
- "goto"
-] @keyword.control
-
-[
- "if"
+ "if"
"else"
"switch"
"select"
@@ -158,6 +154,12 @@
"const"
] @keyword.storage.modifier
+[
+ "defer"
+ "goto"
+ "go"
+] @function.macro
+
; Delimiters
[
@@ -181,10 +183,9 @@
[
(interpreted_string_literal)
(raw_string_literal)
+ (rune_literal)
] @string
-(rune_literal) @constant.character
-
(escape_sequence) @constant.character.escape
[