1 files changed, 51 insertions, 12 deletions
diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm
index 086db67a..99b5eb4d 100644
--- a/runtime/queries/rust/textobjects.scm
+++ b/runtime/queries/rust/textobjects.scm
@@ -1,23 +1,62 @@
-(function_item
-  body: (_) @function.inside) @function.around
+(
+  [
+    (attribute_item)+
+    (line_comment)+
+  ]*
+  .
+  (function_item
+    body: (_) @function.inside)) @function.around
 
-(struct_item
-  body: (_) @class.inside) @class.around
+(
+  [
+    (attribute_item)+
+    (line_comment)+
+  ]*
+  .
+  (struct_item
+    body: (_) @class.inside)) @class.around
 
-(enum_item
-  body: (_) @class.inside) @class.around
+(
+  [
+    (attribute_item)+
+    (line_comment)+
+  ]*
+  .
+  (enum_item
+    body: (_) @class.inside)) @class.around
 
-(union_item
-  body: (_) @class.inside) @class.around
+(
+  [
+    (attribute_item)+
+    (line_comment)+
+  ]*
+  .
+  (union_item
+    body: (_) @class.inside)) @class.around
 
-(trait_item
-  body: (_) @class.inside) @class.around
+(
+  [
+    (attribute_item)+
+    (line_comment)+
+  ]*
+  .
+  (trait_item
+    body: (_) @class.inside)) @class.around
 
-(impl_item
-  body: (_) @class.inside) @class.around
+(
+  [
+    (attribute_item)+
+    (line_comment)+
+  ]*
+  .
+  (impl_item
+    body: (_) @class.inside)) @class.around
 
 (parameters
   (_) @parameter.inside)
+  
+(type_parameters
+  (_) @parameter.inside)
 
 (closure_parameters
   (_) @parameter.inside)