fix(supercollider): update queries after breaking change

Author: elgiano

BUILTIN_TEXTOBJECTS.md

@@ -153,7 +153,7 @@
 <tr>
 <td>slang</td><td><span title="@assignment.inner">🟩</span></td> <td><span title="@assignment.lhs">🟩</span></td> <td><span title="@assignment.outer">🟩</span></td> <td><span title="@assignment.rhs">🟩</span></td> <td><span title="@attribute.inner">⬜</span></td> <td><span title="@attribute.outer">⬜</span></td> <td><span title="@block.inner">⬜</span></td> <td><span title="@block.outer">🟩</span></td> <td><span title="@call.inner">🟩</span></td> <td><span title="@call.outer">🟩</span></td> <td><span title="@class.inner">🟩</span></td> <td><span title="@class.outer">🟩</span></td> <td><span title="@comment.inner">⬜</span></td> <td><span title="@comment.outer">🟩</span></td> <td><span title="@conditional.inner">🟩</span></td> <td><span title="@conditional.outer">🟩</span></td> <td><span title="@frame.inner">⬜</span></td> <td><span title="@frame.outer">⬜</span></td> <td><span title="@function.inner">🟩</span></td> <td><span title="@function.outer">🟩</span></td> <td><span title="@loop.inner">🟩</span></td> <td><span title="@loop.outer">🟩</span></td> <td><span title="@number.inner">🟩</span></td> <td><span title="@parameter.inner">🟩</span></td> <td><span title="@parameter.outer">🟩</span></td> <td><span title="@regex.inner">⬜</span></td> <td><span title="@regex.outer">⬜</span></td> <td><span title="@return.inner">🟩</span></td> <td><span title="@return.outer">🟩</span></td> <td><span title="@scopename.inner">⬜</span></td> <td><span title="@statement.outer">🟩</span></td> </tr>
 <tr>
-<td>supercollider</td><td><span title="@assignment.inner">⬜</span></td> <td><span title="@assignment.lhs">⬜</span></td> <td><span title="@assignment.outer">⬜</span></td> <td><span title="@assignment.rhs">⬜</span></td> <td><span title="@attribute.inner">⬜</span></td> <td><span title="@attribute.outer">⬜</span></td> <td><span title="@block.inner">🟩</span></td> <td><span title="@block.outer">🟩</span></td> <td><span title="@call.inner">⬜</span></td> <td><span title="@call.outer">⬜</span></td> <td><span title="@class.inner">🟩</span></td> <td><span title="@class.outer">🟩</span></td> <td><span title="@comment.inner">⬜</span></td> <td><span title="@comment.outer">🟩</span></td> <td><span title="@conditional.inner">🟩</span></td> <td><span title="@conditional.outer">🟩</span></td> <td><span title="@frame.inner">⬜</span></td> <td><span title="@frame.outer">⬜</span></td> <td><span title="@function.inner">🟩</span></td> <td><span title="@function.outer">🟩</span></td> <td><span title="@loop.inner">🟩</span></td> <td><span title="@loop.outer">🟩</span></td> <td><span title="@number.inner">⬜</span></td> <td><span title="@parameter.inner">🟩</span></td> <td><span title="@parameter.outer">🟩</span></td> <td><span title="@regex.inner">⬜</span></td> <td><span title="@regex.outer">⬜</span></td> <td><span title="@return.inner">⬜</span></td> <td><span title="@return.outer">⬜</span></td> <td><span title="@scopename.inner">⬜</span></td> <td><span title="@statement.outer">⬜</span></td> </tr>
+<td>supercollider</td><td><span title="@assignment.inner">🟩</span></td> <td><span title="@assignment.lhs">🟩</span></td> <td><span title="@assignment.outer">🟩</span></td> <td><span title="@assignment.rhs">🟩</span></td> <td><span title="@attribute.inner">⬜</span></td> <td><span title="@attribute.outer">⬜</span></td> <td><span title="@block.inner">🟩</span></td> <td><span title="@block.outer">🟩</span></td> <td><span title="@call.inner">🟩</span></td> <td><span title="@call.outer">🟩</span></td> <td><span title="@class.inner">🟩</span></td> <td><span title="@class.outer">🟩</span></td> <td><span title="@comment.inner">⬜</span></td> <td><span title="@comment.outer">🟩</span></td> <td><span title="@conditional.inner">🟩</span></td> <td><span title="@conditional.outer">🟩</span></td> <td><span title="@frame.inner">⬜</span></td> <td><span title="@frame.outer">⬜</span></td> <td><span title="@function.inner">🟩</span></td> <td><span title="@function.outer">🟩</span></td> <td><span title="@loop.inner">🟩</span></td> <td><span title="@loop.outer">🟩</span></td> <td><span title="@number.inner">🟩</span></td> <td><span title="@parameter.inner">🟩</span></td> <td><span title="@parameter.outer">🟩</span></td> <td><span title="@regex.inner">⬜</span></td> <td><span title="@regex.outer">⬜</span></td> <td><span title="@return.inner">🟩</span></td> <td><span title="@return.outer">🟩</span></td> <td><span title="@scopename.inner">⬜</span></td> <td><span title="@statement.outer">⬜</span></td> </tr>
 <tr>
 <td>svelte</td><td><span title="@assignment.inner">⬜</span></td> <td><span title="@assignment.lhs">⬜</span></td> <td><span title="@assignment.outer">⬜</span></td> <td><span title="@assignment.rhs">⬜</span></td> <td><span title="@attribute.inner">🟩</span></td> <td><span title="@attribute.outer">🟩</span></td> <td><span title="@block.inner">🟩</span></td> <td><span title="@block.outer">🟩</span></td> <td><span title="@call.inner">⬜</span></td> <td><span title="@call.outer">⬜</span></td> <td><span title="@class.inner">🟩</span></td> <td><span title="@class.outer">🟩</span></td> <td><span title="@comment.inner">⬜</span></td> <td><span title="@comment.outer">🟩</span></td> <td><span title="@conditional.inner">🟩</span></td> <td><span title="@conditional.outer">🟩</span></td> <td><span title="@frame.inner">⬜</span></td> <td><span title="@frame.outer">⬜</span></td> <td><span title="@function.inner">🟩</span></td> <td><span title="@function.outer">🟩</span></td> <td><span title="@loop.inner">🟩</span></td> <td><span title="@loop.outer">🟩</span></td> <td><span title="@number.inner">⬜</span></td> <td><span title="@parameter.inner">⬜</span></td> <td><span title="@parameter.outer">⬜</span></td> <td><span title="@regex.inner">⬜</span></td> <td><span title="@regex.outer">⬜</span></td> <td><span title="@return.inner">⬜</span></td> <td><span title="@return.outer">⬜</span></td> <td><span title="@scopename.inner">⬜</span></td> <td><span title="@statement.outer">⬜</span></td> </tr>
 <tr>

queries/supercollider/textobjects.scm

@@ -1,58 +1,97 @@
-; conditional
-(if
-  true: (function_block)? @conditional.inner
-  false: (function_block)? @conditional.inner) @conditional.outer
+; assignment
+(variable_definition
+  name: (_) @assignment.lhs
+  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
 
-(if
-  (_)? @conditional.inner) @conditional.outer
-
-; loops
-(for
-  (function_block)? @loop.inner) @loop.outer
-
-(while
-  (function_block)? @loop.inner) @loop.outer
+(function_definition
+  name: (_) @assignment.lhs
+  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
 
+; block
 (code_block
-  (_) @block.inner) @block.outer
+  (_)* @block.inner) @block.outer
 
-(class) @class.outer
+; class
+(class_def
+  (class_def_body) @class.inner) @class.outer
 
-(parameter_call_list
-  (_)?) @class.inner
+; call
+(function_call
+  arguments: (_
+    .
+    "("
+    _+ @call.inner
+    ")")?) @call.outer
 
+; comment
 (line_comment) @comment.outer
 
 (block_comment) @comment.outer
 
-(function_block
-  (_) @function.inner) @function.outer
+; conditional:
+(function_call
+  name: (_) @_name
+  (#eq? @_name "if")
+  arguments: (parameter_call_list
+    (_) @conditional.inner)?) @conditional.outer
+
+; function
+((function_block) @function.inner @function.outer
+  (#offset! @function.inner 0 1 0 -1)) ; use offset to skip brackets
+
+; loop
+(function_call
+  name: (identifier) @_fname
+  (#eq? @_fname "while")
+  arguments: (parameter_call_list
+    (_) @loop.inner)?) @loop.outer
+
+(function_call
+  name: (identifier) @_fname
+  (#eq? @_fname "for")
+  arguments: (parameter_call_list
+    (_) @loop.inner .)?) @loop.outer
+
+(function_call
+  name: (identifier) @_fname
+  (#eq? @_fname "forBy")
+  arguments: (parameter_call_list
+    (_) @loop.inner .)?) @loop.outer
+
+; number
+(number) @number.inner
 
 ;parameters
 (parameter_call_list
-  "," @parameter.outer
+  (_) @parameter.inner @parameter.outer
   .
-  (_) @parameter.inner @parameter.outer)
+  (",")? @parameter.outer)
 
 (parameter_call_list
+  "," @parameter.outer
   .
+  (_) @parameter.inner @parameter.outer .)
+
+(parameter_list
   (_) @parameter.inner @parameter.outer
   .
-  ","? @parameter.outer)
+  (",")? @parameter.outer)
 
-((symbol)?
-  (identifier)
+(parameter_list
   "," @parameter.outer
   .
-  ((method_name)
-    (function_call
-      (_))) @parameter.inner @parameter.outer)
+  (_) @parameter.inner @parameter.outer .)
 
-((symbol)?
-  (identifier)
+(collection
+  (_) @parameter.inner @parameter.outer
   .
-  ((method_name)
-    (function_call
-      (_))) @parameter.inner @parameter.outer
+  (",")? @parameter.outer)
+
+(collection
+  "," @parameter.outer
   .
-  ","? @parameter.outer)
+  (_) @parameter.inner @parameter.outer .)
+
+; return
+(return_statement
+  (_) @return.inner) @return.outer