Update tree-sitter queries to latest

queries/c/textobjects.scm

@@ -52,6 +52,18 @@
 
 (if_statement) @conditional.outer
 
+(if_statement
+  condition: (_) @conditional.inner
+  (#offset! @conditional.inner 0 1 0 -1))
+
+(while_statement
+  condition: (_) @conditional.inner
+  (#offset! @conditional.inner 0 1 0 -1))
+
+(do_statement
+  condition: (_) @conditional.inner
+  (#offset! @conditional.inner 0 1 0 -1))
+
 (for_statement
   condition: (_) @conditional.inner)
 

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/haskell/textobjects.scm

@@ -1,6 +1,6 @@
-((exp_apply
+((apply
   .
-  (exp_name)
+  function: (_)
   .
   (_)  @call.inner._start
   .
@@ -9,50 +9,71 @@
   (_)?  @call.inner._end .)
   ) @call.outer
 
-(exp_infix
+(infix
   (_)
-  (variable)
+  [
+    (infix_id
+      (variable)) ; x `plus` y
+    (operator) ; x + y
+  ]
   (_)) @call.outer
 
-(function
-  rhs: (_) @function.inner) @function.outer
+(decl/function) @function.outer
+
+(decl/function
+  patterns: (_)
+  .
+  match: (_)  @function.inner._start
+  match: (_)?  @function.inner._end
+  .
+  )
 
 ; also treat function signature as @function.outer
 (signature) @function.outer
 
+; treat signature with function as @function.outer
+(((decl/signature
+  name: (_) @_sig_name)  @function.outer._start
+  .
+  (decl/function
+    name: (_) @_func_name)  @function.outer._end)
+  (#eq? @_sig_name @_func_name)
+  )
+
 (class) @class.outer
 
 (class
-  (class_body
-    (where)
-    _ @class.inner))
+  "where"
+  _ @class.inner)
 
 (instance
-  (where)?
+  "where"?
   .
   _ @class.inner) @class.outer
 
 (comment) @comment.outer
 
-(exp_cond) @conditional.outer
+(haddock) @comment.outer
 
-(exp_cond
+(expression/conditional) @conditional.outer
+
+(expression/conditional
   (_) @conditional.inner)
 
 ; e.g. forM [1..10] $ \i -> do...
-(exp_infix
-  (exp_apply
-    (exp_name) @_name
+(infix
+  (apply
+    (name) @_name
     (#any-of? @_name "for" "for_" "forM" "forM_"))
   (operator) @_op
   (#eq? @_op "$")
-  (exp_lambda
+  (lambda
     (_)
     (_) @loop.inner)) @loop.outer
 
 ; e.g. forM [1..10] print
-(exp_apply
-  (exp_name) @_name
+(apply
+  (name) @_name
   (#any-of? @_name "for" "for_" "forM" "forM_")
   (_)
   (_) @loop.inner) @loop.outer
@@ -65,35 +86,36 @@
 ; e.g. func mb@(Just x)
 (function
   (patterns
-    (pat_parens
+    (parens
       (_) @parameter.inner)))
 
 (function
   (patterns
-    (pat_as
-      (pat_parens
+    (as
+      (parens
         (_) @parameter.inner))))
 
 (signature
   (context
-    (fun
-      (type_apply) @parameter.inner)))
+    (function
+      (type/apply) @parameter.inner)))
 
 (signature
   (context
-    (fun
-      (type_name) @parameter.inner)))
+    (function
+      (type/name) @parameter.inner)))
 
 (signature
-  (fun
-    (type_apply) @parameter.inner))
+  (function
+    (type/apply) @parameter.inner))
 
 (signature
-  (fun
-    (type_name) @parameter.inner))
+  (function
+    (type/name) @parameter.inner))
 
 (signature
-  (type_apply) @parameter.inner)
+  (type/apply) @parameter.inner)
 
 (signature
-  (type_name) @parameter.inner)
+  (type/name) @parameter.inner)
+

queries/php/textobjects.scm

@@ -12,7 +12,7 @@
 
 (function_definition) @function.outer
 
-(anonymous_function_creation_expression
+(anonymous_function
   body: (compound_statement
     .
     "{"
@@ -23,7 +23,7 @@
     "}"
     ))
 
-(anonymous_function_creation_expression) @function.outer
+(anonymous_function) @function.outer
 
 ; methods
 (method_declaration
@@ -313,3 +313,4 @@
   (global_declaration)
   (function_static_declaration)
 ] @statement.outer
+

queries/r/textobjects.scm

@@ -9,68 +9,56 @@
 (comment) @comment.outer
 
 ; conditional
-(if
+(if_statement
   condition: (_)? @conditional.inner) @conditional.outer
 
 ; function
-[
-  (function_definition)
-  (lambda_function)
-] @function.outer
-
 (function_definition
   [
     (call)
-    (binary)
-    (brace_list)
-  ] @function.inner) @function.outer
-
-(lambda_function
-  [
-    (call)
-    (binary)
-    (brace_list)
+    (binary_operator)
+    (braced_expression)
   ] @function.inner) @function.outer
 
 ; loop
 [
-  (while)
-  (repeat)
-  (for)
+  (while_statement)
+  (repeat_statement)
+  (for_statement)
 ] @loop.outer
 
-(while
+(while_statement
   body: (_) @loop.inner)
 
-(repeat
+(repeat_statement
   body: (_) @loop.inner)
 
-(for
+(for_statement
   body: (_) @loop.inner)
 
 ; statement
-(brace_list
+(braced_expression
   (_) @statement.outer)
 
 (program
   (_) @statement.outer)
 
 ; parameter
-((formal_parameters
-  ","  @parameter.outer._start
+((parameters
+  (comma)  @parameter.outer._start
   .
   (_) @parameter.inner @parameter.outer._end)
   )
 
-((formal_parameters
+((parameters
   .
   (_) @parameter.inner @parameter.outer._start
   .
-  ","?  @parameter.outer._end)
+  (comma)?  @parameter.outer._end)
   )
 
 ((arguments
-  ","  @parameter.outer._start
+  (comma)?  @parameter.outer._start
   .
   (_) @parameter.inner @parameter.outer._end)
   )
@@ -79,44 +67,14 @@
   .
   (_) @parameter.inner @parameter.outer._start
   .
-  ","?  @parameter.outer._end)
+  (comma)?  @parameter.outer._end)
   )
 
 ; number
 (float) @number.inner
 
 ; assignment
-(left_assignment
-  name: (_) @assignment.lhs
-  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
-
-(left_assignment
-  name: (_) @assignment.inner)
-
-(right_assignment
-  value: (_) @assignment.inner @assignment.lhs
-  name: (_) @assignment.rhs) @assignment.outer
-
-(right_assignment
-  name: (_) @assignment.inner)
-
-(equals_assignment
-  name: (_) @assignment.lhs
-  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
-
-(equals_assignment
-  name: (_) @assignment.inner)
-
-(super_assignment
-  name: (_) @assignment.lhs
-  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
-
-(super_assignment
-  name: (_) @assignment.inner)
-
-(super_right_assignment
-  value: (_) @assignment.inner @assignment.lhs
-  name: (_) @assignment.rhs) @assignment.outer
+(binary_operator
+  lhs: (_) @assignment.inner @assignment.lhs
+  rhs: (_) @assignment.rhs) @assignment.outer
 
-(super_right_assignment
-  name: (_) @assignment.inner)