Improve Ruby TextObjects (#4601)

runtime/queries/ruby/textobjects.scm

@@ -1,11 +1,6 @@
-; Class
+; Class and Modules
-(class) @class.around
+(class
-
+  body: (_)? @class.inside) @class.around
-(class [(constant) (scope_resolution)] !superclass
-  (_)+ @class.inside) 
-
-(class [(constant) (scope_resolution)] (superclass)
-  (_)+ @class.inside) 
 
 (singleton_class
   value: (_)
@@ -17,37 +12,32 @@ (class [(constant) (scope_resolution)] (superclass)
   (#match? @class_const "Class")
   (#match? @class_method "new")
   (do_block (_)+ @class.inside)) @class.around
-
-; Functions
-(method) @function.around
-
-(method (identifier) (method_parameters)
-  (_)+ @function.inside)
   
-(do_block !parameters
+(module
-  (_)+ @function.inside)
+  body: (_)? @class.inside) @class.around
-  
+
-(do_block (block_parameters)
+; Functions and Blocks
-  (_)+ @function.inside)
+(singleton_method
-    
+  body: (_)? @function.inside) @function.around
-(block (block_parameters)
+
-  (_)+ @function.inside)
+(method
-      
+  body: (_)? @function.inside) @function.around
-(block !parameters
+
-  (_)+ @function.inside)
+(do_block
-      
+  body: (_)? @function.inside) @function.around
-(method (identifier) !parameters
+
-  (_)+  @function.inside)
+(block
+  body: (_)? @function.inside) @function.around
 
 ; Parameters      
 (method_parameters
-  (_) @parameter.inside)
+  (_) @parameter.inside) @parameter.around
         
 (block_parameters 
-  (_) @parameter.inside)
+  (_) @parameter.inside) @parameter.around
         
 (lambda_parameters 
-  (_) @parameter.inside)
+  (_) @parameter.inside) @parameter.around
 
 ; Comments
 (comment) @comment.inside