Tweak assert match, add top level statement matching

Author: fidgetingbits

queries/nix.scm

@@ -1,19 +1,31 @@
 ;; Statements
 
-[
-    (binding)
-] @statement
+;; Any top-level expression that isn't a comment is a statement
+(
+    (source_code
+        (_) @statement
+    ) @_.iteration
+    (#not-type? @statement comment)
+)
+(source_code) @comment.iteration
+
+;; Any foo = <expression> anywhere is a statement
+(binding) @statement
+(binding_set) @map.iteration @list.iteration @ifStatement.iteration
+
 ;; This matches assert statements as stand-alone statements. This
 ;; is because it's common to have a series of assert statements in a file, which
 ;; would otherwise all match as a single statement. See the playground/nix/asserts.nix
 ;; file for an example.
-(assert_expression
-    "assert" @statement.start
-    condition: (_) @condition
-    ";" @statement.end
-) @_.domain
-(binding_set) @map.iteration @list.iteration @ifStatement.iteration
-(source_code) @statement.iteration @map.iteration @comment.iteration
+(
+    (assert_expression
+        "assert" @statement.start
+        condition: (_) @condition
+        ";" @statement.end
+        body: (_)
+    ) @_.domain
+    (#not-parent-type? @_.domain binding)
+)
 
 ;;!! let
 ;;!!   a = 1;
@@ -95,9 +107,14 @@
 ;;!         ^^^^^^^^ Func1 due to currying
 ;;!      ^^^^^^^^^^^ Func2 due to currying
 (function_expression
-    universal: (identifier) @argumentOrParameter
+    [
+        ;; Match a: style arg
+        (identifier)
+        ;; Match { a, b }: style
+        (formals)
+    ] @argumentOrParameter
     body: (_) @anonymousFunction.interior
-) @anonymousFunction @argumentOrParameter.iteration
+) @_.domain @anonymousFunction @argumentOrParameter.iteration
 
 ;; We define the named function as the full assignment of the lambda
 ;; This means funk name becomes the variable holding the lambda