queries: Rewrite all locals

Author: the-mikedavis

runtime/queries/_javascript/locals.scm

@@ -6,9 +6,9 @@
 
 ; (i)
 (formal_parameters 
-  (identifier) @local.definition)
+  (identifier) @local.definition.variable.parameter)
 
 ; (i = 1)
 (formal_parameters 
   (assignment_pattern
-    left: (identifier) @local.definition))
+    left: (identifier) @local.definition.variable.parameter))

runtime/queries/_typescript/locals.scm

@@ -11,7 +11,7 @@
 ;------------
 
 (type_parameter
-  name: (type_identifier) @local.definition)
+  name: (type_identifier) @local.definition.type.parameter)
 
 ; Javascript and Typescript Treesitter grammars deviate when defining the
 ; tree structure for parameters, so we need to address them in each specific
@@ -20,14 +20,15 @@
 ; (i: t)
 ; (i: t = 1)
 (required_parameter
-  (identifier) @local.definition)
+  (identifier) @local.definition.variable.parameter)
 
 ; (i?: t)
 ; (i?: t = 1) // Invalid but still possible to highlight.
 (optional_parameter
-  (identifier) @local.definition)
+  (identifier) @local.definition.variable.parameter)
 
 ; References
 ;-----------
 
 (type_identifier) @local.reference
+(identifier) @local.reference

runtime/queries/ada/locals.scm

@@ -5,25 +5,6 @@
 (subprogram_body) @local.scope
 (block_statement) @local.scope
 
-(with_clause (_) @local.definition)
-(procedure_specification name: (_) @local.definition)
-(function_specification name: (_) @local.definition)
-(package_declaration name: (_) @local.definition)
-(package_body name: (_) @local.definition)
-(generic_instantiation . name: (_) @local.definition)
-(component_declaration . (identifier) @local.definition)
-(exception_declaration . (identifier) @local.definition)
-(formal_object_declaration . (identifier) @local.definition)
-(object_declaration . (identifier) @local.definition)
-(parameter_specification . (identifier) @local.definition)
-(full_type_declaration . (identifier) @local.definition)
-(private_type_declaration . (identifier) @local.definition)
-(private_extension_declaration . (identifier) @local.definition)
-(incomplete_type_declaration . (identifier) @local.definition)
-(protected_type_declaration . (identifier) @local.definition)
-(formal_complete_type_declaration . (identifier) @local.definition)
-(formal_incomplete_type_declaration . (identifier) @local.definition)
-(task_type_declaration . (identifier) @local.definition)
-(subtype_declaration . (identifier) @local.definition)
+(parameter_specification . (identifier) @local.definition.variable.parameter)
 
 (identifier) @local.reference

runtime/queries/bibtex/locals.scm

@@ -14,14 +14,14 @@
 ; Definitions
 
 (parameter
-  (identifier) @local.definition)
+  (identifier) @local.definition.variable.parameter)
 
 (type_parameters
-  (type_identifier) @local.definition)
+  (type_identifier) @local.definition.type.parameter)
 (constrained_type_parameter
-  left: (type_identifier) @local.definition)
+  left: (type_identifier) @local.definition.type.parameter)
 
-(closure_parameters (identifier) @local.definition)
+(closure_parameters (identifier) @local.definition.variable.parameter)
 
 ; References
 (identifier) @local.reference

runtime/queries/cairo/locals.scm

@@ -30,67 +30,7 @@
 
 ; Definitions
 
-(annotation_definition_identifier) @local.definition
-
-(const_identifier) @local.definition
-
-(enum (enum_identifier) @local.definition)
-
-[
-  (enum_member)
-  (field_identifier)
-] @local.definition
-
-(method_identifier) @local.definition
-
-(namespace) @local.definition
-
 [
   (param_identifier)
   (return_identifier)
-] @local.definition
-
-(group (type_identifier) @local.definition)
-
-(struct (type_identifier) @local.definition)
-
-(union (type_identifier) @local.definition)
-
-(interface (type_identifier) @local.definition)
-
-; Generics Related (don't know how to combine these)
-
-(struct
-  (generics
-    (generic_parameters
-      (generic_identifier) @local.definition)))
-
-(interface
-  (generics
-    (generic_parameters
-      (generic_identifier) @local.definition)))
-
-(method
-  (implicit_generics
-    (implicit_generic_parameters
-      (generic_identifier) @local.definition)))
-
-(method
-  (generics
-    (generic_parameters
-      (generic_identifier) @local.definition)))
-
-(annotation
-  (generics
-    (generic_parameters
-      (generic_identifier) @local.definition)))
-
-(replace_using
-  (generics
-    (generic_parameters
-      (generic_identifier) @local.definition)))
-
-(return_type
-  (generics
-    (generic_parameters
-      (generic_identifier) @local.definition)))
+] @local.definition.variable.parameter

runtime/queries/capnp/locals.scm

@@ -3,7 +3,7 @@
 (main_component_definition) @local.scope
 (block_statement) @local.scope
 
-(parameter name: (identifier) @local.definition) @local.definition
+(parameter name: (identifier) @local.definition.variable.parameter)
 
 
-(identifier) @local.reference
+(identifier) @local.reference

runtime/queries/circom/locals.scm

@@ -12,7 +12,7 @@
 ;------------
 
 (class_definition
- body: (_) @local.definition)
+ body: (_) @local.definition.type)
 
 ; References
 ;------------

runtime/queries/dart/locals.scm

@@ -12,30 +12,9 @@
 ; Definitions
 ;------------
 
-; ...i
-(rest_pattern
-  (identifier) @local.definition)
-
-; { i }
-(object_pattern
-  (shorthand_property_identifier_pattern) @local.definition)
-
-; { a: i }
-(object_pattern
-  (pair_pattern
-    value: (identifier) @local.definition))
-
-; [ i ]
-(array_pattern
-  (identifier) @local.definition)
-
 ; i => ...
 (arrow_function
-  parameter: (identifier) @local.definition)
-
-; const/let/var i = ...
-(variable_declarator
-  name: (identifier) @local.definition)
+  parameter: (identifier) @local.definition.variable.parameter)
 
 ; References
 ;------------

runtime/queries/ecma/locals.scm

@@ -6,8 +6,8 @@
 (infix_declaration) @local.scope
 (let_in_expr) @local.scope
 
-(function_declaration_left (lower_pattern (lower_case_identifier)) @local.definition)
-(function_declaration_left (lower_case_identifier) @local.definition)
+(function_declaration_left (lower_pattern (lower_case_identifier)) @local.definition.function)
+(function_declaration_left (lower_case_identifier) @local.definition.function)
 
 (value_expr(value_qid(upper_case_identifier)) @local.reference)
 (value_expr(value_qid(lower_case_identifier)) @local.reference)

runtime/queries/elm/locals.scm

@@ -1,30 +1,23 @@
 ; Specs and Callbacks
 (attribute
   (stab_clause
-    pattern: (arguments (variable)? @local.definition)
+    pattern: (arguments (variable)? @local.definition.variable.parameter)
     ; If a spec uses a variable as the return type (and later a `when` clause to type it):
-    body: (variable)? @local.definition)) @local.scope
+    body: (variable)? @local.definition.variable.parameter)) @local.scope
 
 ; parametric `-type`s
 ((attribute
     name: (atom) @_type
     (arguments
       (binary_operator
-        left: (call (arguments (variable) @local.definition))
+        left: (call (arguments (variable) @local.definition.variable.parameter))
         operator: "::") @local.scope))
  (#match? @_type "(type|opaque)"))
 
-; macros
-((attribute
-   name: (atom) @_define
-   (arguments
-     (call (arguments (variable) @local.definition)))) @local.scope
- (#eq? @_define "define"))
-
 ; `fun`s
-(anonymous_function (stab_clause pattern: (arguments (variable) @local.definition))) @local.scope
+(anonymous_function (stab_clause pattern: (arguments (variable) @local.definition.variable.parameter))) @local.scope
 
 ; Ordinary functions
-(function_clause pattern: (arguments (variable) @local.definition)) @local.scope
+(function_clause pattern: (arguments (variable) @local.definition.variable.parameter)) @local.scope
 
 (variable) @local.reference

runtime/queries/erlang/locals.scm

@@ -6,27 +6,16 @@
   (function_or_value_defn)
 ] @local.scope
 
-(value_declaration_left
-  .
-  [
-   (_ (identifier) @local.definition)
-   (_ (_ (identifier) @local.definition))
-   (_ (_ (_ (identifier) @local.definition)))
-   (_ (_ (_ (_ (identifier) @local.definition))))
-   (_ (_ (_ (_ (_ (identifier) @local.definition)))))
-   (_ (_ (_ (_ (_ (_ (identifier) @local.definition))))))
-  ])
-
 (function_declaration_left
   .
-  ((_) @local.definition)
+  ((_) @local.definition.function)
   ((argument_patterns
     [
-     (_ (identifier) @local.definition)
-     (_ (_ (identifier) @local.definition))
-     (_ (_ (_ (identifier) @local.definition)))
-     (_ (_ (_ (_ (identifier) @local.definition))))
-     (_ (_ (_ (_ (_ (identifier) @local.definition)))))
-     (_ (_ (_ (_ (_ (_ (identifier) @local.definition))))))
+     (_ (identifier) @local.definition.variable.parameter)
+     (_ (_ (identifier) @local.definition.variable.parameter))
+     (_ (_ (_ (identifier) @local.definition.variable.parameter)))
+     (_ (_ (_ (_ (identifier) @local.definition.variable.parameter))))
+     (_ (_ (_ (_ (_ (identifier) @local.definition.variable.parameter)))))
+     (_ (_ (_ (_ (_ (_ (identifier) @local.definition.variable.parameter))))))
     ])
   ))

runtime/queries/fsharp/locals.scm

@@ -4,12 +4,7 @@
 (case_clause) @local.scope
 
 ; Definitions
-(let pattern: (identifier) @local.definition)
-(function_parameter name: (identifier) @local.definition)
-(list_pattern (identifier) @local.definition)
-(list_pattern assign: (identifier) @local.definition)
-(tuple_pattern (identifier) @local.definition)
-(record_pattern_argument pattern: (identifier) @local.definition)
+(function_parameter name: (identifier) @local.definition.variable.parameter)
 
 ; References
 (identifier) @local.reference

runtime/queries/gleam/locals.scm

@@ -10,26 +10,14 @@
 
 (type_parameter_list
   (parameter_declaration
-    name: (identifier) @local.definition))
+    name: (identifier) @local.definition.variable.parameter))
 
-(parameter_declaration (identifier) @local.definition)
-(variadic_parameter_declaration (identifier) @local.definition)
-
-(short_var_declaration
-  left: (expression_list
-          (identifier) @local.definition))
-
-(var_spec
-  (identifier) @local.definition)
-
-(for_statement
- (range_clause
-   left: (expression_list
-           (identifier) @local.definition)))
+(parameter_declaration (identifier) @local.definition.variable.parameter)
+(variadic_parameter_declaration (identifier) @local.definition.variable.parameter)
 
 (const_declaration
  (const_spec
-  name: (identifier) @local.definition))
+  name: (identifier) @local.definition.constant))
 
 ; References
 

runtime/queries/gn/locals.scm

@@ -6,8 +6,8 @@
 (infix_declaration) @local.scope
 (let_in_expr) @local.scope
 
-(function_declaration_left (lower_pattern (lower_case_identifier)) @local.definition)
-(function_declaration_left (lower_case_identifier) @local.definition)
+(function_declaration_left (lower_pattern (lower_case_identifier)) @local.definition.function)
+(function_declaration_left (lower_case_identifier) @local.definition.function)
 
 (value_expr(value_qid(upper_case_identifier)) @local.reference)
 (value_expr(value_qid(lower_case_identifier)) @local.reference)

runtime/queries/go/locals.scm

@@ -1,6 +1,6 @@
 (function_definition) @local.scope
 
 (parameter
-  name: (identifier) @local.definition)
+  name: (identifier) @local.definition.variable.parameter)
 
 (identifier) @local.reference

runtime/queries/gren/locals.scm

@@ -3,17 +3,10 @@
 (function_declaration) @local.scope
 (compound_expression) @local.scope
 
-(global_binding
-  (identifier) @local.definition)
-(constant_binding
-  (identifier) @local.definition)
-(type_binding
-  (identifier) @local.definition)
-
 (function_declaration
-  (identifier) @local.definition)
+  (identifier) @local.definition.function)
 (function_declaration
-  (parameter (name) @local.definition))
+  (parameter (name) @local.definition.variable.parameter))
 
 (identifier) @local.reference
 

runtime/queries/groovy/locals.scm

@@ -1,4 +1,3 @@
-(signature name: (variable)) @local.definition
-(function name: (variable)) @local.definition
-(pat_name (variable)) @local.definition
+(signature name: (variable) @local.definition.function)
+(function name: (variable) @local.definition.function)
 (exp_name (variable)) @local.reference