feat(queries): add folds, indents, injections, locals, and tags, upda…

…te highlights

queries/folds.scm

@@ -0,0 +1,39 @@
+[
+  (use_statement) 
+  (actor_definition)
+  (class_definition)
+  (primitive_definition)
+  (interface_definition)
+  (trait_definition)
+  (struct_definition)
+
+  (constructor)
+  (method)
+  (behavior)
+
+  (parameters)
+
+  (type)
+
+  (if_statement)
+  (iftype_statement)
+  (elseif_block)
+  (elseiftype_block)
+  (else_block)
+  (for_statement)
+  (while_statement)
+  (try_statement)
+  (with_statement)
+  (repeat_statement)
+  (recover_statement)
+  (match_statement)
+  (case_statement)
+  (parenthesized_expression)
+  (tuple_expression)
+
+  (array_literal)
+  (object_literal)
+  (string)
+
+  (block_comment)
+] @fold

queries/highlights.scm

@@ -72,7 +72,7 @@
 
 (iftype_statement "end" @conditional)
 
-(match_expression "end" @conditional)
+(match_statement "end" @conditional)
 
 ; Repeats
 
@@ -99,7 +99,7 @@
 
 (try_statement "end" @exception)
 
-(recover_expression "end" @exception)
+(recover_statement "end" @exception)
 
 ; Attributes
 
@@ -147,6 +147,8 @@
 
 ; Types
 
+(type_alias (identifier) @type.definition)
+
 (base_type name: (identifier) @type)
 
 (generic_parameter (identifier) @type)

queries/indents.scm

@@ -0,0 +1,60 @@
+[
+  (use_statement) 
+  (actor_definition)
+  (class_definition)
+  (primitive_definition)
+  (interface_definition)
+  (trait_definition)
+  (struct_definition)
+
+  (constructor)
+  (method)
+  (behavior)
+
+  (parameters)
+
+  (if_block)
+  (then_block)
+  (elseif_block)
+  (else_block)
+  (iftype_statement)
+  (elseiftype_block)
+  (do_block)
+  (match_statement)
+  (parenthesized_expression)
+  (tuple_expression)
+
+  (array_literal)
+  (object_literal)
+] @indent
+
+(try_statement (block) @indent)
+
+(repeat_statement (block) @indent)
+
+(recover_statement (block) @indent)
+
+(return_statement (block) @indent)
+
+(continue_statement (block) @indent)
+
+(break_statement (block) @indent)
+
+[
+  "}"
+  "]"
+  ")"
+] @indent_end
+
+[ "{" "}" ] @branch
+
+[ "[" "]" ] @branch
+
+[ "(" ")" ] @branch
+
+[
+  (ERROR)
+  (string)
+  (line_comment)
+  (block_comment)
+] @auto

queries/injections.scm

@@ -0,0 +1,4 @@
+[
+  (line_comment)
+  (block_comment)
+] @comment

queries/locals.scm

@@ -0,0 +1,79 @@
+; Scopes
+
+[
+  (use_statement) 
+  (actor_definition)
+  (class_definition)
+  (primitive_definition)
+  (interface_definition)
+  (trait_definition)
+  (struct_definition)
+
+  (constructor)
+  (method)
+  (behavior)
+
+  (if_statement)
+  (iftype_statement)
+  (elseif_block)
+  (elseiftype_block)
+  (else_block)
+  (for_statement)
+  (while_statement)
+  (try_statement)
+  (with_statement)
+  (repeat_statement)
+  (recover_statement)
+  (match_statement)
+  (case_statement)
+  (parenthesized_expression)
+  (tuple_expression)
+
+  (array_literal)
+  (object_literal) 
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(field
+  name: (identifier) @definition.field)
+
+(use_statement
+  (identifier) @definition.import)
+
+(constructor
+  (identifier) @definition.method)
+
+(method
+  (identifier) @definition.method)
+
+(behavior
+  (identifier) @definition.method)
+
+(actor_definition
+  (identifier) @definition.type)
+
+(type_alias
+  (identifier) @definition.type)
+
+(class_definition
+  (identifier) @definition.type)
+
+(primitive_definition
+  (identifier) @definition.type)
+
+(interface_definition
+  (identifier) @definition.type)
+
+(trait_definition
+  (identifier) @definition.type)
+
+(struct_definition
+  (identifier) @definition.type)
+
+(parameter
+  name: (identifier) @definition.parameter)

queries/tags.scm

@@ -0,0 +1,38 @@
+;Class definitions 	@definition.class
+;Function definitions 	@definition.function
+;Interface definitions 	@definition.interface
+;Method definitions 	@definition.method
+;Module definitions 	@definition.module
+;Function/method calls 	@reference.call
+;Class reference 	@reference.class
+;Interface implementation 	@reference.implementation
+(
+  (identifier) @reference.class
+  (#match? @reference.class "^_*[A-Z][a-zA-Z0-9_]*$")
+)
+
+(class_definition (identifier) @name) @definition.class
+(actor_definition (identifier) @name) @definition.class
+(primitive_definition (identifier) @name) @definition.class
+(struct_definition (identifier) @name) @definition.class
+(type_alias (identifier) @name) @definition.class
+
+(trait_definition (identifier) @name) @definition.interface
+(interface_definition (identifier) @name) @definition.interface
+
+(method (identifier) @name) @definition.method
+(behavior (identifier) @name) @definition.method
+
+(class_definition (type) @name) @reference.implementation
+(actor_definition (type) @name) @reference.implementation
+(primitive_definition (type) @name) @reference.implementation
+(struct_definition (type) @name) @reference.implementation
+(type_alias (type) @name) @reference.implementation
+
+; calls - not catching all possible call cases of callees for capturing the method name
+(call_expression callee: [(identifier) (ffi_identifier)] @name) @reference.call
+(call_expression callee: (generic_expression [(identifier) (ffi_identifier)] @name)) @reference.call
+(call_expression callee: (member_expression (identifier) @name .)) @reference.call
+(call_expression callee: (member_expression (generic_expression [(identifier) (ffi_identifier)] @name) .)) @reference.call
+; TODO: add more possible callee expressions
+(call_expression) @reference.call