Update tree-sitter queries to latest

queries/astro/textobjects.scm

@@ -0,0 +1,2 @@
+; inherits: html
+

queries/bash/textobjects.scm

@@ -25,3 +25,6 @@
 (variable_assignment name: (_) @assignment.inner @assignment.lhs)
 (variable_assignment value: (_) @assignment.inner @assignment.rhs)
 
+(command
+  argument: (word) @parameter.inner)
+

queries/c/textobjects.scm

@@ -19,23 +19,32 @@
 (enum_specifier
   body: (_) @class.inner) @class.outer
 
-; conditional
+; conditionals
 (if_statement
-  consequence: (_)? @conditional.inner
-  alternative: (_)? @conditional.inner
-  ) @conditional.outer
+  consequence: (compound_statement . "{" . (_)  @conditional.inner._start  @conditional.inner._end (_)?  @conditional.inner._end . "}"
+  )) @conditional.outer
 
 (if_statement
-  condition: (_) @conditional.inner)
+  alternative: (else_clause (compound_statement . "{" . (_)  @conditional.inner._start  @conditional.inner._end (_)?  @conditional.inner._end . "}"
+  ))) @conditional.outer
+
+(if_statement) @conditional.outer
 
 ; loops
-(for_statement
-  (_)? @loop.inner) @loop.outer
+(while_statement) @loop.outer
 (while_statement
-  (_)? @loop.inner) @loop.outer
-(do_statement
-  (_)? @loop.inner) @loop.outer
+  body: (compound_statement . "{" . (_)  @loop.inner._start  @loop.inner._end (_)?  @loop.inner._end . "}"
+  )) @loop.outer
 
+(for_statement) @loop.outer
+(for_statement
+  body: (compound_statement . "{" . (_)  @loop.inner._start  @loop.inner._end (_)?  @loop.inner._end . "}"
+  )) @loop.outer
+
+(do_statement) @loop.outer
+(do_statement
+  body: (compound_statement . "{" . (_)  @loop.inner._start  @loop.inner._end (_)?  @loop.inner._end . "}"
+  )) @loop.outer
 
 (compound_statement) @block.outer
 (comment) @comment.outer

queries/c_sharp/textobjects.scm

@@ -10,6 +10,10 @@
   body: (block . "{" . (_)  @function.inner._start  @function.inner._end (_)?  @function.inner._end . "}"
   )) @function.outer
 
+(method_declaration
+  body: (arrow_expression_clause . (_)  @function.inner._start  @function.inner._end (_)?  @function.inner._end
+  )) @function.outer
+
 (constructor_declaration
   body: (block . "{" . (_)  @function.inner._start  @function.inner._end (_)?  @function.inner._end . "}"
   )) @function.outer

queries/cpp/textobjects.scm

@@ -6,8 +6,10 @@
   type: (enum_specifier)
   default_value: (initializer_list) @class.inner) @class.outer
 
-(for_range_loop 
-  (_)? @loop.inner) @loop.outer
+(for_range_loop)@loop.outer
+(for_range_loop
+  body: (compound_statement . "{" . (_)  @loop.inner._start  @loop.inner._end (_)?  @loop.inner._end . "}"
+  ))
 
 (template_declaration
   (function_definition) @function.outer) @function.outer.start

queries/ecma/textobjects.scm

@@ -1,14 +1,14 @@
 (function_declaration
   body: (statement_block)) @function.outer
 
-(function
+(function_expression
   body: (statement_block)) @function.outer
 
 (function_declaration
   body: (statement_block . "{" . (_)  @function.inner._start  @function.inner._end (_)?  @function.inner._end . "}"
  ))
 
-(function
+(function_expression
   body: (statement_block . "{" . (_)  @function.inner._start  @function.inner._end (_)?  @function.inner._end . "}"
  ))
 
@@ -55,6 +55,12 @@
   consequence: (statement_block . "{" . (_)  @conditional.inner._start  @conditional.inner._end (_)?  @conditional.inner._end . "}"
   )) @conditional.outer
 
+(if_statement
+  alternative: (else_clause (statement_block . "{" . (_)  @conditional.inner._start  @conditional.inner._end (_)?  @conditional.inner._end . "}"
+  ))) @conditional.outer
+
+(if_statement) @conditional.outer
+
 (switch_statement
   body: (_)? @conditional.inner) @conditional.outer
 
@@ -63,6 +69,12 @@
   arguments: (arguments . "(" . (_)  @call.inner._start (_)?  @call.inner._end . ")"
   ))
 
+((new_expression
+  constructor: (identifier) @_cons
+  arguments: (arguments . "(" . (_)  @call.inner._start (_)?  @call.inner._end . ")") @_args)
+
+ )
+
 ;; blocks
 (_ (statement_block) @block.inner) @block.outer
 
@@ -120,3 +132,8 @@
 (variable_declarator
  name: (_) @assignment.inner)
 
+(object
+  (pair
+    key: (_) @assignment.lhs
+    value: (_) @assignment.inner @assignment.rhs) @assignment.outer)
+

queries/fennel/textobjects.scm

@@ -1,53 +1,35 @@
-
 ; https://fennel-lang.org/reference
 
 (comment) @comment.outer
 
 (_ . "(" ")" .) @statement.outer
 
-; functions
-((fn . name: (_)? . (parameters) . docstring: (_)? . (_)  @function.inner._start . (_)* . (_)?  @function.inner._end .)
- ) @function.outer
-
-((lambda . name: (_)? . (parameters) . docstring: (_)? . (_)  @function.inner._start . (_)* . (_)?  @function.inner._end .)
- ) @function.outer
-
-(hashfn ["#" "hashfn"] @function.outer.start (_) @function.inner) @function.outer
-
-; parameters
-(parameters (_) @parameter.inner)
-(parameters (_) @parameter.outer)
+; functions & parameters
+(list .
+  (symbol) @_fn 
+  (symbol)? @_fn_name 
+  (sequence
+    (_) @parameter.inner) 
+  (_)* @function.inner
+  (#any-of? @_fn "fn" "lambda" "λ")) @function.outer 
 
 ; call
-((list . [(multi_symbol) (symbol)] @_sym . (_)  @call.inner._start . (_)* . (_)?  @call.inner._end .)
-
- (#not-any-of? @_sym "if" "do" "while" "for" "let" "when")) @call.outer
+(list .
+  (symbol) @_fn_name
+  (_)* @call.inner
+  (#not-any-of? @_fn_name "if" "do" "while" "for" "each" "let" "when" "fn")) @call.outer
 
 ; conditionals
-((list . ((symbol) @_if (#any-of? @_if "if" "when")) . (_) .
-  (_)  @conditional.inner._start .
-  (_)* .
-  (_)?  @conditional.inner._end .)
- ) @conditional.outer
-
+(list
+  (symbol) @_cond
+  (_)
+  (_)* @conditional.inner
+  (#any-of? @_cond "if" "when")) @conditional.outer
 
 ; loops
-((for . (for_clause) .
-  (_)  @loop.inner._start .
-  (_)* .
-  (_)?  @loop.inner._end .)
- ) @loop.outer
-
-((each . (_) .
-  (_)  @loop.inner._start .
-  (_)* .
-  (_)?  @loop.inner._end .)
- ) @loop.outer
-
-((list . ((symbol) @_while (#eq? @_while "while")) . (_) .
-  (_)  @loop.inner._start .
-  (_)* .
-  (_)?  @loop.inner._end .)
- ) @loop.outer
-
+(list .
+  (symbol) @_sym .
+  (_) .
+  (_)* @loop.inner
+  (#any-of? @_sym "each" "while" "for")) @loop.outer
 

queries/fish/textobjects.scm

@@ -1,4 +1,10 @@
-(function_definition) @function.outer
+;; assignment
+(command
+  name: (word) @_command
+  argument: (word) @_varname @assignment.lhs @assignment.inner
+  argument: (_)* @assignment.rhs
+  (#not-lua-match? @_varname "[-].*")
+  (#eq? @_command "set")) @assignment.outer
 
 (command
   name: (word) @_name

queries/gdscript/textobjects.scm

@@ -0,0 +1,59 @@
+(function_definition
+  body: (_) @function.inner) @function.outer
+
+(constructor_definition
+  body: (_) @function.inner) @function.outer
+
+(class_definition
+  body: (_) @class.inner) @class.outer
+
+(if_statement
+  body: (_) @conditional.inner) @conditional.outer
+
+(if_statement
+  alternative: (_ (_) @conditional.inner)?) @conditional.outer
+
+(if_statement
+  condition: (_) @conditional.inner)
+
+[
+  (for_statement)
+  (while_statement)
+] @loop.outer
+
+(while_statement body: (_) @loop.inner)
+
+(for_statement body: (_) @loop.inner)
+
+(comment) @comment.outer
+
+(parameters
+  ","  @parameter.outer._start .
+  (_) @parameter.inner @parameter.outer._end
+ )
+
+(parameters
+  . (_) @parameter.inner @parameter.outer._start
+  . ","?  @parameter.outer._end
+ )
+
+(arguments
+  ","  @parameter.outer._start .
+  (_) @parameter.inner @parameter.outer._end
+ )
+
+(arguments
+  . (_) @parameter.inner @parameter.outer._start
+  . ","?  @parameter.outer._end
+ )
+
+(array
+  ","  @parameter.outer._start .
+  (_) @parameter.inner @parameter.outer._end
+ )
+
+(array
+  . (_) @parameter.inner @parameter.outer._start
+  . ","?  @parameter.outer._end
+ )
+

queries/latex/textobjects.scm

@@ -16,7 +16,28 @@
 
 [
   (generic_command)
-] @statement.outer
+  (text_mode)
+] @call.outer
+
+(text_mode
+  (curly_group
+    "{"
+    .
+    (_)  @call.inner._start
+    (_)?  @call.inner._end
+    .
+    "}")
+  )
+
+(generic_command
+  (curly_group
+    "{"
+    .
+    (_)  @call.inner._start
+    (_)?  @call.inner._end
+    .
+    "}")
+  )
 
 [
   (chapter)