Support interpolated string args, add assert condition/branch, fix if…

… branch

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

@@ -11,20 +11,18 @@ command:
           scopeType: {type: branch}
   usePrePhraseSnapshot: true
 initialState:
-  documentContents: |
+  documentContents: |-
     {
-      key = if a then b else c;
-
+      foo = if a then b else c;
     }
   selections:
     - anchor: {line: 1, character: 9}
       active: {line: 1, character: 9}
   marks: {}
 finalState:
-  documentContents: |
+  documentContents: |-
     {
-      key =  then b else c;
-
+      foo =  else c;
     }
   selections:
     - anchor: {line: 1, character: 8}

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

@@ -0,0 +1,29 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: chuck arg
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: argumentOrParameter}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      d = "Interpolated ${value1} string ${value2}";
+    }
+  selections:
+    - anchor: {line: 1, character: 26}
+      active: {line: 1, character: 26}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      d = "Interpolated string ${value2}";
+    }
+  selections:
+    - anchor: {line: 1, character: 20}
+      active: {line: 1, character: 20}

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

@@ -0,0 +1,29 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: chuck key
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: collectionKey}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      d = "Interpolated ${value1} string ${value2}";
+    }
+  selections:
+    - anchor: {line: 1, character: 6}
+      active: {line: 1, character: 6}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      "Interpolated ${value1} string ${value2}";
+    }
+  selections:
+    - anchor: {line: 1, character: 2}
+      active: {line: 1, character: 2}

queries/nix.scm

@@ -23,12 +23,17 @@
 (
     (assert_expression
         "assert" @statement.start
-        condition: (_) @condition
+        condition: (_)
         ";" @statement.end
         body: (_)
     ) @_.domain
     (#not-parent-type? @_.domain binding)
 )
+(assert_expression
+    "assert" @functionCallee @functionCall.start
+    condition: (_) @condition
+    body: (_) @branch @functionCall.end.startOf
+) @_.domain
 
 (
     (with_expression) @statement
@@ -52,19 +57,17 @@
 ;;!        ^^^^^^^^^^^^^^^^^^
 (if_expression) @ifStatement @branch.iteration @condition.iteration
 ;;!! key = if a then b else c;
-;;!        ^^^^
+;;!        ^^^^^^^^^^^
+;;!        xxxxxxxxxxxx
 (if_expression
     "if" @branch.start
-    condition: (_) @branch.end
-)
-;;!! key = if a then b else c;
-;;!             ^^^^^^
-(if_expression
-    "then" @branch.start
+    condition: (_)
+    "then"
     consequence: (_) @branch.end
 )
 ;;!! key = if a then b else c;
 ;;!                    ^^^^^^
+;;!                   xxxxxxx
 (if_expression
     "else" @branch.start
     alternative: (_) @branch.end
@@ -93,9 +96,11 @@
 
 ;;!! foo = { x = 1; y = 2; };
 ;;!          ^
+;;!          xxxx
 ;;!          -----
 (binding
-    attrpath: (_) @collectionKey
+    attrpath: (_) @collectionKey @_.trailing.start.endOf
+    expression: (_) @_.trailing.end.startOf
 ) @_.domain
 
 ;; Strings
@@ -110,6 +115,13 @@
 ] @string
 (string_fragment) @textFragment
 
+;;!! d = "foo ${bar} baz"
+;;!           ^^^^^^
+;;!      <**************>
+(string_expression
+    (interpolation) @argumentOrParameter
+) @_.iteration
+
 ;; Functions
 
 ;; Note for this part of the function, we identify is as lambda only
@@ -166,10 +178,10 @@
 
 ;;!! a = 25;
 ;;!  ^
-;;!  xx
+;;!  xxxx
 ;;!  -------
 (binding
-    (_) @name @_.leading.end.startOf
+    (_) @name @_.leading.end.startOf @_.trailing.start.endOf
     .
-    expression: (_)
+    expression: (_) @_.trailing.end.startOf
 ) @_.domain