From 074fa1c175e3226d34b86f127e9d5129cfa54c11 Mon Sep 17 00:00:00 2001
From: Abin Simon <mail@meain.io>
Date: Thu, 17 Aug 2023 10:37:59 +0530
Subject: [PATCH] Update queries to latest

---
 .github/workflows/update-queries.yaml |  2 +-
 queries/scala/textobjects.scm         |  3 +++
 queries/v/textobjects.scm             | 29 ++++++++++++++++++---------
 scripts/fix-queries                   |  2 +-
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/update-queries.yaml b/.github/workflows/update-queries.yaml
index 84b29ae..2d1f987 100644
--- a/.github/workflows/update-queries.yaml
+++ b/.github/workflows/update-queries.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Update repos
         run: |
           git clone --depth 1 https://github.com/nvim-treesitter/nvim-treesitter-textobjects /tmp/nts
-          rm -r queries && mv /tmp/nts/queries .
+          rm -r queries && cp -r /tmp/nts/queries .
           ./scripts/fix-queries
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
diff --git a/queries/scala/textobjects.scm b/queries/scala/textobjects.scm
index bf3f023..7113d15 100644
--- a/queries/scala/textobjects.scm
+++ b/queries/scala/textobjects.scm
@@ -13,5 +13,8 @@
 (class_parameter
   name: (identifier) @parameter.inner) @parameter.outer
 
+(case_clause
+  body: (_) @conditional.inner) @conditional.outer
+
 (comment) @comment.outer
 
diff --git a/queries/v/textobjects.scm b/queries/v/textobjects.scm
index 6b69647..b5fccca 100644
--- a/queries/v/textobjects.scm
+++ b/queries/v/textobjects.scm
@@ -1,18 +1,18 @@
 ;; assignment
-[(short_var_declaration
-    left: (_) @assignment.lhs
-    right: (_)* @assignment.rhs)
+[(var_declaration
+    var_list: (_) @assignment.lhs
+    expression_list: (_)* @assignment.rhs)
   (assignment_statement
     left: (_) @assignment.lhs
     right: (_)* @assignment.rhs)]
 
-[(short_var_declaration
-    left: (_) @assignment.inner)
+[(var_declaration
+    var_list: (_) @assignment.inner)
   (assignment_statement
     left: (_) @assignment.inner)]
 
-[(short_var_declaration
-    right: (_) @assignment.inner)
+[(var_declaration
+    expression_list: (_) @assignment.inner)
   (assignment_statement
     right: (_) @assignment.inner)]
 
@@ -28,7 +28,7 @@
 
 ;; class: structs
 (struct_declaration
-  (struct_field_declaration_list . "{" . (_)  @class.inner._start  @class.inner._end (_)?  @class.inner._end . "}"
+  ("{" . (_)  @class.inner._start  @class.inner._end (_)?  @class.inner._end . "}"
   ))
 
 (struct_declaration) @class.outer
@@ -45,7 +45,7 @@
 
 ;; conditional
 (if_expression
-  consequence: (block . "{" . (_)  @conditional.inner._start  @conditional.inner._end (_)?  @conditional.inner._end . "}"
+  block: (block . "{" . (_)  @conditional.inner._start  @conditional.inner._end (_)?  @conditional.inner._end . "}"
     )?) @conditional.outer
 
 ;; function
@@ -71,3 +71,14 @@
   (parameter_declaration) @parameter.inner @parameter.outer._end
  )
 
+(parameter_list
+  . (parameter_declaration) @parameter.inner @parameter.outer._start
+  . ","?  @parameter.outer._end
+ )
+
+;; return
+(return_statement (_)* @return.inner) @return.outer
+
+;; statements
+(block (_) @statement.outer)
+
diff --git a/scripts/fix-queries b/scripts/fix-queries
index b549492..c0e62ce 100755
--- a/scripts/fix-queries
+++ b/scripts/fix-queries
@@ -5,6 +5,6 @@ set -e
 find queries -type f |
 	while read -r file; do
         echo "Processing $file"
-		go run converter/main.go "$file" > "$file.new"
+		go run converter/main.go "$file" | sed 's|#lua-match|#match|' > "$file.new"
         mv "$file.new" "$file"
 	done