.

Author: kiyoon

queries/rust/textobjects.scm

@@ -150,35 +150,31 @@
 (parameters
   "," @parameter.outer
   .
-  (self_parameter) @parameter.inner @parameter.outer)
+  [
+    (self_parameter)
+    (parameter)
+    (type_identifier)
+  ] @parameter.inner @parameter.outer)
 
 (parameters
   .
-  (self_parameter) @parameter.inner @parameter.outer
+  [
+    (self_parameter)
+    (parameter)
+    (type_identifier)
+  ] @parameter.inner @parameter.outer
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
 (parameters
-  "," @parameter.outer
-  .
-  (parameter) @parameter.inner @parameter.outer)
-
-(parameters
-  .
-  (parameter) @parameter.inner @parameter.outer
-  .
-  ","? @parameter.outer)
-
-(parameters
-  "," @parameter.outer
+  [
+    (self_parameter)
+    (parameter)
+    (type_identifier)
+  ] @parameter.outer
   .
-  (type_identifier) @parameter.inner @parameter.outer)
-
-(parameters
-  .
-  (type_identifier) @parameter.inner @parameter.outer
-  .
-  ","? @parameter.outer)
+  "," @parameter.outer .)
 
 (type_parameters
   "," @parameter.outer
@@ -191,6 +187,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(type_parameters
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (tuple_pattern
   "," @parameter.outer
   .
@@ -202,6 +204,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(tuple_pattern
+  (identifier) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (tuple_struct_pattern
   "," @parameter.outer
   .
@@ -213,6 +221,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(tuple_struct_pattern
+  (identifier) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (tuple_expression
   "," @parameter.outer
   .
@@ -224,6 +238,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(tuple_expression
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (tuple_type
   "," @parameter.outer
   .
@@ -235,6 +255,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(tuple_type
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (struct_item
   body: (field_declaration_list
     "," @parameter.outer
@@ -248,6 +274,13 @@
     .
     ","? @parameter.outer))
 
+; last element, with trailing comma
+(struct_item
+  body: (field_declaration_list
+    (_) @parameter.outer
+    .
+    "," @parameter.outer .))
+
 (struct_expression
   body: (field_initializer_list
     "," @parameter.outer
@@ -261,6 +294,13 @@
     .
     ","? @parameter.outer))
 
+; last element, with trailing comma
+(struct_expression
+  body: (field_initializer_list
+    (_) @parameter.outer
+    .
+    "," @parameter.outer .))
+
 (closure_parameters
   "," @parameter.outer
   .
@@ -272,6 +312,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(closure_parameters
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (arguments
   "," @parameter.outer
   .
@@ -283,6 +329,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(arguments
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (type_arguments
   "," @parameter.outer
   .
@@ -294,6 +346,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(type_arguments
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (token_tree
   "," @parameter.outer
   .
@@ -305,6 +363,12 @@
   .
   ","? @parameter.outer)
 
+; last element, with trailing comma
+(token_tree
+  (_) @parameter.outer
+  .
+  "," @parameter.outer .)
+
 (scoped_use_list
   list: (use_list
     "," @parameter.outer
@@ -318,6 +382,13 @@
     .
     ","? @parameter.outer))
 
+; last element, with trailing comma
+(scoped_use_list
+  list: (use_list
+    (_) @parameter.outer
+    .
+    "," @parameter.outer .))
+
 [
   (integer_literal)
   (float_literal)