Add argument for lambdas

Author: fidgetingbits

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeArgBlueDot.yml

@@ -0,0 +1,39 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: change arg blue dot
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: blue, character: .}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: argumentOrParameter}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    { lib, buildPackages, fetchurl, stdenv, ... }:
+
+    stdenv.mkDerivation rec {
+      name = "example-nix-package";
+      version = "1.0";
+    }
+  selections:
+    - anchor: {line: 0, character: 17}
+      active: {line: 0, character: 17}
+  marks:
+    blue..:
+      start: {line: 0, character: 40}
+      end: {line: 0, character: 43}
+finalState:
+  documentContents: |-
+    { lib, buildPackages, fetchurl, stdenv,  }:
+
+    stdenv.mkDerivation rec {
+      name = "example-nix-package";
+      version = "1.0";
+    }
+  selections:
+    - anchor: {line: 0, character: 40}
+      active: {line: 0, character: 40}

queries/nix.scm

@@ -3,14 +3,18 @@
 [
     (binding)
 ] @statement
+;; 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: (_) @statement.condition
+    condition: (_)
     ";" @statement.end
     body: (_)
 )
 (binding_set) @map.iteration @list.iteration @ifStatement.iteration
-(source_code) @statement.iteration @map.iteration
+(source_code) @statement.iteration @map.iteration @comment.iteration
 
 ;;!! let
 ;;!!   a = 1;
@@ -60,6 +64,10 @@
     (rec_attrset_expression)
 ] @map @statement.iteration @value.iteration @name.iteration
 
+;;!! foo = { x = 1; y = 2; };
+;;!          ^
+(attrpath) @collectionKey
+
 ;; Strings
 
 ;;!! # foo
@@ -91,8 +99,9 @@
 ;;!         ^^^^^^^^ Func1 due to currying
 ;;!      ^^^^^^^^^^^ Func2 due to currying
 (function_expression
+    universal: (identifier) @argumentOrParameter
     body: (_)
-) @anonymousFunction
+) @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
@@ -110,6 +119,9 @@
 (apply_expression) @functionCall
 (formals) @argumentOrParameter.iteration
 (formal) @argumentOrParameter
+(formals
+    (ellipses) @argumentOrParameter
+)
 
 ;; value