minor fixes and add condition

Author: fidgetingbits

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

@@ -0,0 +1,35 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: change condition
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: condition}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      key =
+        if a > b
+        then b
+        else c;
+    }
+  selections:
+    - anchor: {line: 3, character: 9}
+      active: {line: 3, character: 9}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      key =
+        if 
+        then b
+        else c;
+    }
+  selections:
+    - anchor: {line: 2, character: 7}
+      active: {line: 2, character: 7}

queries/nix.scm

@@ -24,14 +24,14 @@
 ;;!! in a + b
 (let_expression
     "let"
-    (_) @statement.iteration @value.iteration @name.iteration @condition.iteration
+    (_) @statement.iteration @value.iteration @name.iteration
 )
 
 ;; Conditionals
 
 ;;!! key = if a then b else c;
 ;;!        ^^^^^^^^^^^^^^^^^^
-(if_expression) @ifStatement @branch.iteration
+(if_expression) @ifStatement @branch.iteration @condition.iteration
 ;;!! key = if a then b else c;
 ;;!        ^^^^
 (if_expression
@@ -51,6 +51,12 @@
     alternative: (_) @branch.end
 )
 
+;;!! key = if a > 10 then b else c;
+;;!           ^^^^^^
+(if_expression
+    condition: (_) @condition
+) @_.domain
+
 ;; Lists and maps
 
 ;;!! foo = [ a b c ];
@@ -77,17 +83,11 @@
 ;;!  ^^^^^
 (comment) @comment @textFragment
 
-(string_expression
-    _ @textFragment.start.endOf
-    (string_fragment)
-    _ @textFragment.end.startOf
-) @string
-
-(indented_string_expression
-    "''" @textFragment.start.endOf
-    (string_fragment)
-    "''" @textFragment.end.startOf
-) @string
+[
+    (string_expression)
+    (indented_string_expression)
+] @string
+(string_fragment) @textFragment
 
 ;; Functions