Make foo@{a,b} a single arg, and other tests for statements

Author: fidgetingbits

queries/nix.scm

@@ -10,7 +10,10 @@
 (source_code) @comment.iteration
 
 ;; Any foo = <expression> anywhere is a statement
-(binding) @statement
+[
+    (inherit)
+    (binding)
+] @statement
 (binding_set) @map.iteration @list.iteration @ifStatement.iteration
 
 ;; This matches assert statements as stand-alone statements. This
@@ -27,6 +30,11 @@
     (#not-parent-type? @_.domain binding)
 )
 
+(
+    (with_expression) @statement
+    (#not-parent-type? @statement binding)
+)
+
 ;;!! let
 ;;!!   a = 1;
 ;;!   <******
@@ -110,11 +118,19 @@
 ;;!      ^^^^^^^^^^^ Func2 due to currying
 (function_expression
     [
+        (
+            ;; Match foo@{ a, b }: style
+            (identifier) @argumentOrParameter.start
+            "@"
+            (formals) @argumentOrParameter.end
+        )
         ;; Match a: style arg
-        (identifier)
+        (identifier) @argumentOrParameter
+
         ;; Match { a, b }: style
-        (formals)
-    ] @argumentOrParameter
+        (formals) @argumentOrParameter
+    ]
+    .
     body: (_) @anonymousFunction.interior
 ) @_.domain @anonymousFunction @argumentOrParameter.iteration