From 78235ce600cf6541e2bfd1367c9e2d41c36a41c5 Mon Sep 17 00:00:00 2001
From: meain <meain@users.noreply.github.com>
Date: Fri, 10 Nov 2023 13:06:04 +0000
Subject: [PATCH] Update tree-sitter queries to latest

---
 queries/astro/textobjects.scm |  2 ++
 queries/c/textobjects.scm     | 29 +++++++++++++++++++----------
 queries/ecma/textobjects.scm  |  6 ++++++
 queries/fish/textobjects.scm  |  8 +++++++-
 queries/rust/textobjects.scm  | 13 ++++++-------
 5 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 queries/astro/textobjects.scm

diff --git a/queries/astro/textobjects.scm b/queries/astro/textobjects.scm
new file mode 100644
index 0000000..718c4db
--- /dev/null
+++ b/queries/astro/textobjects.scm
@@ -0,0 +1,2 @@
+; inherits: html
+
diff --git a/queries/c/textobjects.scm b/queries/c/textobjects.scm
index 4c5345e..231f0cf 100644
--- a/queries/c/textobjects.scm
+++ b/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
diff --git a/queries/ecma/textobjects.scm b/queries/ecma/textobjects.scm
index 3fbdcfd..1decc4c 100644
--- a/queries/ecma/textobjects.scm
+++ b/queries/ecma/textobjects.scm
@@ -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
 
diff --git a/queries/fish/textobjects.scm b/queries/fish/textobjects.scm
index 525ae35..40c59be 100644
--- a/queries/fish/textobjects.scm
+++ b/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
diff --git a/queries/rust/textobjects.scm b/queries/rust/textobjects.scm
index 7ec5f7d..5c140e0 100644
--- a/queries/rust/textobjects.scm
+++ b/queries/rust/textobjects.scm
@@ -185,13 +185,12 @@
   . (_) @parameter.inner @parameter.outer._start . ","?  @parameter.outer._end)
  )
 
-;; Disabled as not available in upstream language grammar repo (will need rust lang update)
-;; ((token_tree
-;;   ","  @parameter.outer._start . (_) @parameter.inner @parameter.outer._end)
-;;  )
-;; ((token_tree
-;;   . (_) @parameter.inner @parameter.outer._start . ","?  @parameter.outer._end)
-;;  )
+((token_tree
+  ","  @parameter.outer._start . (_) @parameter.inner @parameter.outer._end)
+ )
+((token_tree
+  . (_) @parameter.inner @parameter.outer._start . ","?  @parameter.outer._end)
+ )
 
 (scoped_use_list
   list: (use_list ","  @parameter.outer._start . (_) @parameter.inner @parameter.outer._end