Implement the necessary queries

This implements all highlights, locals, and tags.

grammar.js

@@ -374,13 +374,17 @@ module.exports = grammar({
 
     // Method calls
     _call_name: $ => choice(
-      alias($.identifier_with_special, $.identifier),
-      $.identifier,
-      $.constant,
+      // Identifiers are aliased as "name" such that highliths don't conflict
+      // with locals (e.g. ensuring `name` in `self.name` doesn't get
+      // highlighted as a variable if a local variable with the same name
+      // exists).
+      alias($.identifier_with_special, $.name),
+      alias($.identifier, $.name),
+      alias($.constant, $.name),
       $.integer,
     ),
     call: $ => choice(
-      seq(field('name', alias($.identifier_with_special, $.identifier))),
+      seq(field('name', alias($.identifier_with_special, $.name))),
       seq(
         field('name', $._call_name),
         field('arguments', alias($.call_arguments, $.arguments)),

package.json

@@ -49,7 +49,9 @@
       "scope": "source.inko",
       "injection-regex": "^inko$",
       "file-types": ["inko"],
-      "highlights": ["queries/highlights.scm"]
+      "highlights": ["queries/highlights.scm"],
+      "locals": ["queries/locals.scm"],
+      "tags": ["queries/tags.scm"]
     }
   ]
 }

queries/highlights.scm

@@ -47,18 +47,16 @@
   "ref"
   "trait"
   "uni"
-  ;"break"
-  ;"else"
-  ;"loop"
-  ;"match"
-  ;"move"
-  ;"next"
+  "loop"
+  "match"
+  "else"
+  "move"
   "or"
-  ;"recover"
-  ;"return"
-  ;"throw"
-  ;"try"
-  ;"while"
+  "recover"
+  "return"
+  "throw"
+  "try"
+  "while"
   (modifier)
   (visibility)
 ] @keyword
@@ -70,6 +68,8 @@
 [
   (nil)
   (self)
+  (break)
+  (next)
 ] @keyword
 
 [
@@ -114,3 +114,10 @@
 ; Methods
 (method name: _ @function)
 (external_function name: _ @function)
+(argument name: _ @variable)
+(named_argument name: _ @variable)
+
+(call name: _ @function)
+(identifier) @variable
+((identifier) @function
+ (#is-not? local))

queries/locals.scm

@@ -0,0 +1,10 @@
+[
+  (method)
+  (block)
+] @local.scope
+
+(argument name: _ @local.definition)
+(define_variable name: _ @local.definition)
+(named_argument name: _ @local.definition)
+
+(identifier) @local.reference

queries/tags.scm

@@ -0,0 +1,4 @@
+(method name: _ @name) @definition.function
+(external_function name: _ @name) @definition.function
+(class name: _ @name) @definition.class
+(trait name: _ @name) @definition.interface