Merge branch 'master' into debug

2 files changed, 65 insertions, 4 deletions

diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 224c8b78..3129c4b2 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -17,9 +17,18 @@
 
 ; Identifiers
 
+((identifier) @constant (match? @constant "^[A-Z][A-Z\\d_]+$"))
+(const_spec
+  name: (identifier) @constant)
+
+(parameter_declaration (identifier) @variable.parameter)
+(variadic_parameter_declaration (identifier) @variable.parameter)
+
 (type_identifier) @type
 (field_identifier) @property
 (identifier) @variable
+(package_identifier) @variable
+
 
 ; Operators
 
@@ -79,10 +88,8 @@
   "go"
   "goto"
   "if"
-  "import"
   "interface"
   "map"
-  "package"
   "range"
   "return"
   "select"
@@ -92,6 +99,29 @@
   "var"
 ] @keyword
 
+[
+  "import"
+  "package"
+] @keyword.control.import
+
+; Delimiters
+
+[
+  ":"
+  "."
+  ","
+  ";"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
 ; Literals
 
 [
@@ -111,7 +141,8 @@
 [
   (true)
   (false)
-  (nil)
-] @constant.builtin
+] @constant.builtin.boolean
+
+(nil) @constant.builtin
 
 (comment) @comment
diff --git a/runtime/queries/go/locals.scm b/runtime/queries/go/locals.scm
new file mode 100644
index 00000000..d240e2b7
--- /dev/null
+++ b/runtime/queries/go/locals.scm
@@ -0,0 +1,30 @@
+; Scopes
+
+(block) @local.scope
+
+; Definitions
+
+(parameter_declaration (identifier) @local.definition)
+(variadic_parameter_declaration (identifier) @local.definition)
+
+(short_var_declaration
+  left: (expression_list
+          (identifier) @local.definition))
+
+(var_spec
+  name: (identifier) @local.definition)
+
+(for_statement
+ (range_clause
+   left: (expression_list
+           (identifier) @local.definition)))
+
+(const_declaration
+ (const_spec
+  name: (identifier) @local.definition))
+
+; References
+
+(identifier) @local.reference
+(field_identifier) @local.reference
+