feat: queries from master to main (#820)

There are some queries updated for master branch only and not on main.
Thus I added a few changes to the main.

Note that anything with `#make-range` won't work on `main` thus they
need adaptation. I put "partially" in such cases.

- [x] css
- [x] ecma
- [x] enforce
- [x] go (change not needed for main)
- [x] java
- [x] jsx
- [x] kotlin
- [x] lua
- [x] ocaml
- [x] rust
- [x] svelte
- [x] toml
- [x] typescript
- [x] verilog

```
File                                          main (date)               master (date)             Newer

queries/apex/textobjects.scm                  2024-09-27 02:43:04       2024-09-08 17:22:38       main
queries/astro/textobjects.scm                 2023-11-08 01:14:11       2023-11-08 01:14:11       same
queries/bash/textobjects.scm                  2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/bibtex/textobjects.scm                2021-04-11 03:54:24       2021-04-11 03:54:24       same
queries/c_sharp/textobjects.scm               2024-09-27 02:43:04       2024-08-02 08:52:05       main
queries/c/textobjects.scm                     2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/cmake/textobjects.scm                 2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/cpp/textobjects.scm                   2024-09-27 02:43:04       2024-04-14 00:41:53       main
queries/css/textobjects.scm                   2024-09-27 02:43:04       2025-05-07 10:11:32       master
queries/cuda/textobjects.scm                  2021-06-25 15:10:03       2021-06-25 15:10:03       same
queries/dart/textobjects.scm                  2024-09-27 02:43:04       2024-04-14 00:41:53       main
queries/dockerfile/textobjects.scm            2023-01-26 04:32:25       2023-01-26 04:32:25       same
queries/ecma/textobjects.scm                  2024-09-27 02:43:04       2025-05-21 11:34:58       master
queries/elixir/textobjects.scm                2024-09-27 02:43:04       2024-08-02 15:24:05       main
queries/elm/textobjects.scm                   2024-09-27 02:43:04       2024-04-14 00:41:53       main
queries/enforce/textobjects.scm               N/A                       2025-05-13 15:23:53       master
queries/fennel/textobjects.scm                2024-09-27 02:43:04       2024-05-10 02:48:29       main
queries/fish/textobjects.scm                  2025-06-29 01:42:39       2024-04-04 15:46:59       main
queries/foam/textobjects.scm                  2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/gdscript/textobjects.scm              2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/glimmer/textobjects.scm               2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/glsl/textobjects.scm                  2021-10-02 18:10:07       2021-10-02 18:10:07       same
queries/go/textobjects.scm                    2024-09-27 02:43:04       2024-09-27 11:40:01       master
queries/hack/textobjects.scm                  2022-07-09 06:35:39       2022-07-09 06:35:39       same
queries/haskell/textobjects.scm               2024-09-27 02:43:04       2024-08-04 19:57:46       main
queries/hcl/textobjects.scm                   2024-09-27 02:43:04       2024-04-12 14:22:16       main
queries/heex/textobjects.scm                  2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/hlsl/textobjects.scm                  2023-08-18 06:06:25       2023-08-18 06:06:25       same
queries/html/textobjects.scm                  2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/inko/textobjects.scm                  2024-09-27 02:43:04       2024-05-23 09:19:04       main
queries/java/textobjects.scm                  2024-09-27 02:43:04       2025-07-29 23:02:00       master
queries/javascript/textobjects.scm            2022-08-31 06:18:58       2022-08-31 06:18:58       same
queries/jsx/textobjects.scm                   2024-04-04 15:46:59       2025-04-15 10:47:23       master
queries/julia/textobjects.scm                 2025-06-29 01:42:39       2024-11-22 16:36:33       main
queries/kotlin/textobjects.scm                2024-04-04 15:46:59       2025-04-06 22:21:53       master
queries/latex/textobjects.scm                 2024-09-27 02:43:04       2024-08-05 01:24:29       main
queries/lua/textobjects.scm                   2024-09-27 02:43:04       2025-03-01 00:45:15       master
queries/markdown/textobjects.scm              2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/matlab/textobjects.scm                2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/nasm/textobjects.scm                  2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/nim/textobjects.scm                   2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/nix/textobjects.scm                   2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/ocaml/textobjects.scm                 N/A                       2025-03-08 09:49:01       master
queries/odin/textobjects.scm                  2025-06-29 01:42:39       2024-06-05 22:22:10       main
queries/perl/textobjects.scm                  2023-10-22 07:56:55       2023-10-22 07:56:55       same
queries/php_only/textobjects.scm              2024-04-08 04:12:54       2024-04-08 04:12:54       same
queries/php/textobjects.scm                   2024-09-27 02:43:04       2024-08-20 14:48:58       main
queries/python/textobjects.scm                2025-06-29 01:42:39       2024-08-07 20:10:58       main
queries/ql/textobjects.scm                    2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/query/textobjects.scm                 2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/r/textobjects.scm                     2024-09-27 02:43:04       2024-08-01 22:03:45       main
queries/readline/textobjects.scm              2024-02-17 03:46:03       2024-02-17 03:46:03       same
queries/rst/textobjects.scm                   2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/ruby/textobjects.scm                  2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/rust/textobjects.scm                  2024-09-27 02:43:04       2025-05-23 12:45:22       master
queries/scala/textobjects.scm                 2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/scss/textobjects.scm                  2023-01-26 04:32:25       2023-01-26 04:32:25       same
queries/slang/textobjects.scm                 2024-04-14 00:41:53       2024-04-14 00:41:53       same
queries/supercollider/textobjects.scm         2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/svelte/textobjects.scm                N/A                       2025-03-04 09:40:19       master
queries/swift/textobjects.scm                 2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/tact/textobjects.scm                  2024-09-27 02:43:04       2024-08-02 00:09:16       main
queries/terraform/textobjects.scm             2024-04-12 14:24:19       2024-04-12 14:24:19       same
queries/toml/textobjects.scm                  2024-09-27 02:43:04       2025-04-27 12:50:05       master
queries/tsx/textobjects.scm                   2020-10-10 02:21:46       2020-10-10 02:21:46       same
queries/twig/textobjects.scm                  2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/typescript/textobjects.scm            2024-09-27 02:43:04       2025-06-14 18:43:27       master
queries/v/textobjects.scm                     2025-06-29 01:42:39       2024-04-04 15:46:59       main
queries/verilog/textobjects.scm               2024-04-04 15:46:59       2024-10-16 18:02:33       master
queries/vim/textobjects.scm                   2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/vue/textobjects.scm                   2024-04-04 15:46:59       2024-04-04 15:46:59       same
queries/wgsl_bevy/textobjects.scm             2022-12-31 23:23:07       2022-12-31 23:23:07       same
queries/wgsl/textobjects.scm                  2024-09-27 02:43:04       2024-04-04 15:46:59       main
queries/yaml/textobjects.scm                  2025-06-29 01:42:39       2024-04-04 15:46:59       main
queries/zig/textobjects.scm                   2025-10-31 08:53:53       2024-08-30 14:07:39       main
```

Author: kiyoon

queries/css/textobjects.scm

@@ -13,3 +13,5 @@
 
 (declaration
   (property_name) @assignment.inner)
+
+(comment) @comment.outer

queries/ecma/textobjects.scm

@@ -1,6 +1,9 @@
 (function_declaration
   body: (statement_block)) @function.outer
 
+(generator_function_declaration
+  body: (statement_block)) @function.outer
+
 (function_expression
   body: (statement_block)) @function.outer
 
@@ -11,6 +14,13 @@
     _+ @function.inner
     "}"))
 
+(generator_function_declaration
+  body: (statement_block
+    .
+    "{"
+    _+ @function.inner
+    "}"))
+
 (function_expression
   body: (statement_block
     .
@@ -42,7 +52,14 @@
     "}"))
 
 (class_declaration
-  body: (class_body) @class.inner) @class.outer
+  body: (class_body)) @class.outer
+
+(class_declaration
+  body: (class_body
+    .
+    "{"
+    _+ @class.inner
+    "}"))
 
 (export_statement
   (class_declaration)) @class.outer
@@ -131,6 +148,12 @@
   .
   ","? @parameter.outer)
 
+; last element with trailing comma
+(formal_parameters
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 ; If the array/object pattern is the first parameter, treat its elements as the argument list
 (formal_parameters
   .
@@ -162,6 +185,21 @@
         ","? @parameter.outer)
     ]))
 
+; last element with trailing comma
+(formal_parameters
+  .
+  (_
+    [
+      (object_pattern
+        (_) @parameter.outer
+        .
+        "," @parameter.outer .)
+      (array_pattern
+        (_) @parameter.outer
+        .
+        "," @parameter.outer .)
+    ]))
+
 ; arguments
 (arguments
   "," @parameter.outer
@@ -174,6 +212,12 @@
   .
   ","? @parameter.outer)
 
+; last element with trailing comma
+(arguments
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 ; comment
 (comment) @comment.outer
 
@@ -184,9 +228,10 @@
 ; number
 (number) @number.inner
 
-(variable_declarator
-  name: (_) @assignment.lhs
-  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
+(lexical_declaration
+  (variable_declarator
+    name: (_) @assignment.lhs
+    value: (_) @assignment.inner @assignment.rhs)) @assignment.outer
 
 (variable_declarator
   name: (_) @assignment.inner)
@@ -195,3 +240,133 @@
   (pair
     key: (_) @assignment.lhs
     value: (_) @assignment.inner @assignment.rhs) @assignment.outer)
+
+(return_statement
+  (_) @return.inner) @return.outer
+
+(return_statement) @statement.outer
+
+[
+  (if_statement)
+  (expression_statement)
+  (for_statement)
+  (while_statement)
+  (do_statement)
+  (for_in_statement)
+  (export_statement)
+  (lexical_declaration)
+] @statement.outer
+
+; 1.  default import
+(import_statement
+  (import_clause
+    (identifier) @parameter.inner @parameter.outer))
+
+; 2.  namespace import  e.g. `* as React`
+(import_statement
+  (import_clause
+    (namespace_import
+      (identifier) @parameter.inner) @parameter.outer))
+
+; 3.  named import  e.g. `import { Bar, Baz } from ...`
+(import_statement
+  (import_clause
+    (named_imports
+      (import_specifier) @parameter.inner)))
+
+; 3‑A.  named import followed by a comma
+(import_statement
+  (import_clause
+    (named_imports
+      (import_specifier) @parameter.outer
+      .
+      "," @parameter.outer)))
+
+; 3‑B.  comma followed by named import
+(import_statement
+  (import_clause
+    (named_imports
+      "," @parameter.outer
+      .
+      (import_specifier) @parameter.outer)))
+
+; 3-C.  only one named import without a comma
+(import_statement
+  (import_clause
+    (named_imports
+      .
+      (import_specifier) @parameter.outer .)))
+
+; Treat list or object elements as @parameter
+; 1. parameter.inner
+(object
+  (_) @parameter.inner)
+
+(array
+  (_) @parameter.inner)
+
+(object_pattern
+  (_) @parameter.inner)
+
+(array_pattern
+  (_) @parameter.inner)
+
+; 2. parameter.outer: Only one element, no comma
+(object
+  .
+  (_) @parameter.outer .)
+
+(array
+  .
+  (_) @parameter.outer .)
+
+(object_pattern
+  .
+  (_) @parameter.outer .)
+
+(array_pattern
+  .
+  (_) @parameter.outer .)
+
+; 3. parameter.outer: Comma before or after
+[
+  (object
+    "," @parameter.outer
+    .
+    (_) @parameter.outer)
+  (array
+    "," @parameter.outer
+    .
+    (_) @parameter.outer)
+  (object_pattern
+    "," @parameter.outer
+    .
+    (_) @parameter.outer)
+  (array_pattern
+    "," @parameter.outer
+    .
+    (_) @parameter.outer)
+]
+
+[
+  (object
+    .
+    (_) @parameter.outer
+    .
+    "," @parameter.outer)
+  (array
+    .
+    (_) @parameter.outer
+    .
+    "," @parameter.outer)
+  (object_pattern
+    .
+    (_) @parameter.outer
+    .
+    "," @parameter.outer)
+  (array_pattern
+    .
+    (_) @parameter.outer
+    .
+    "," @parameter.outer)
+]

queries/enforce/textobjects.scm

@@ -0,0 +1,54 @@
+[
+  (comment_line)
+  (comment_block)
+  (doc_line)
+  (doc_block)
+] @comment.outer
+
+[
+  (literal_int)
+  (literal_float)
+] @number.inner
+
+; TODO: capture inside braces
+(decl_class
+  body: (_) @class.inner) @class.outer
+
+(decl_method
+  body: (_) @function.inner) @function.outer
+
+(for
+  body: (_) @loop.inner) @loop.outer
+
+(while
+  body: (_) @loop.inner) @loop.outer
+
+(return
+  (_)? @return.inner) @return.outer
+
+; blocks
+(block) @block.outer
+
+(invokation) @call.outer
+
+(formal_parameters
+  "," @parameter.outer
+  .
+  (formal_parameter) @parameter.inner @parameter.outer)
+
+(formal_parameters
+  .
+  (formal_parameter) @parameter.inner @parameter.outer
+  .
+  ","? @parameter.outer)
+
+(actual_parameters
+  "," @parameter.outer
+  .
+  (actual_parameter) @parameter.inner @parameter.outer)
+
+(actual_parameters
+  .
+  (actual_parameter) @parameter.inner @parameter.outer
+  .
+  ","? @parameter.outer)

queries/java/textobjects.scm

@@ -19,6 +19,9 @@
     _+ @function.inner
     "}"))
 
+(return_statement
+  (_)? @return.inner) @return.outer
+
 (for_statement
   body: (_)? @loop.inner) @loop.outer
 

queries/jsx/textobjects.scm

@@ -1,5 +1,8 @@
 ; inherits: ecma
 
+(jsx_attribute) @attribute.outer
+
 (jsx_attribute
   (property_identifier)
-  (_) @parameter.inner) @parameter.outer
+  (_
+    (_) @attribute.inner))

queries/kotlin/textobjects.scm

@@ -2,7 +2,7 @@
   [
     (class_body)
     (enum_class_body)
-  ] @class.inner) @class.outer
+  ]? @class.inner) @class.outer
 
 [
   (function_declaration

queries/lua/textobjects.scm

@@ -18,7 +18,8 @@
 
 ; class
 ; comment
-(comment) @comment.outer
+(comment
+  (comment_content) @comment.inner) @comment.outer
 
 ; conditional
 (if_statement
@@ -103,3 +104,6 @@
 
 ; scopename
 ; statement
+(statement) @statement.outer
+
+(return_statement) @statement.outer

queries/ocaml/textobjects.scm

@@ -0,0 +1,49 @@
+(value_definition
+  (let_binding
+    body: (_) @function.inner)) @function.outer
+
+(method_definition
+  body: (_) @function.inner) @function.outer
+
+(class_definition
+  (class_binding
+    body: (_) @class.inner)) @class.outer
+
+(for_expression
+  (do_clause
+    (_) @loop.inner)) @loop.outer
+
+(while_expression
+  (do_clause
+    (_) @loop.inner)) @loop.outer
+
+(if_expression
+  condition: (_)
+  (then_clause
+    (_) @conditional.inner)
+  (else_clause
+    (_) @conditional.inner)) @conditional.outer
+
+(if_expression
+  condition: (_)
+  (then_clause
+    (_) @conditional.inner)) @conditional.outer
+
+(function_expression
+  (match_case)+ @conditional.inner) @conditional.outer
+
+(match_expression
+  (match_case)+ @conditional.inner) @conditional.outer
+
+(comment) @comment.outer
+
+(parameter) @parameter.outer
+
+(application_expression
+  argument: (_) @parameter.outer) @call.outer
+
+(application_expression
+  argument: (_)+ @call.inner)
+
+(parenthesized_expression
+  _+ @block.inner) @block.outer