1 files changed, 33 insertions, 49 deletions
diff --git a/runtime/queries/julia/locals.scm b/runtime/queries/julia/locals.scm
index d5ac794e..07b96f2c 100644
--- a/runtime/queries/julia/locals.scm
+++ b/runtime/queries/julia/locals.scm
@@ -1,59 +1,43 @@
+; -----------
+; Definitions
+; -----------
 
+; Imports
 (import_statement
- (identifier) @definition.import)
-(variable_declaration
- (identifier) @local.definition)
-(variable_declaration
- (tuple_expression
-  (identifier) @local.definition))
-(for_binding
- (identifier) @local.definition)
-(for_binding
- (tuple_expression
-  (identifier) @local.definition))
-
-(assignment_expression
- (tuple_expression
-  (identifier) @local.definition))
-(assignment_expression
- (bare_tuple_expression
-  (identifier) @local.definition))
-(assignment_expression
- (identifier) @local.definition)
-
-(type_parameter_list
-  (identifier) @definition.type)
-(type_argument_list
-  (identifier) @definition.type)
-(struct_definition
-  name: (identifier) @definition.type)
+  (identifier) @local.definition)
+  
+; Constants
+(const_statement
+  (variable_declaration
+    . (identifier) @local.definition))
 
+; Parameters
 (parameter_list
- (identifier) @definition.parameter)
+  (identifier) @local.definition)
+
 (typed_parameter
- (identifier) @definition.parameter
- (identifier))
-(function_expression
- . (identifier) @definition.parameter)
-(argument_list
- (typed_expression
-  (identifier) @definition.parameter
-  (identifier)))
-(spread_parameter
- (identifier) @definition.parameter)
+  . (identifier) @local.definition)
 
-(function_definition
- name: (identifier) @definition.function) @local.scope
-(macro_definition 
- name: (identifier) @definition.macro) @local.scope
+(optional_parameter .
+  (identifier) @local.definition)
 
-(identifier) @local.reference
+(spread_parameter
+  (identifier) @local.definition)
+
+(function_expression
+  . (identifier) @local.definition)
+ 
+; ------
+; Scopes
+; ------
 
 [
-  (try_statement)
-  (finally_clause)
-  (quote_statement)
-  (let_statement)
-  (compound_expression)
-  (for_statement)
+  (function_definition)
+  (macro_definition)
 ] @local.scope
+
+; ----------
+; References
+; ----------
+
+(identifier) @local.reference