Better statement support and tests

Author: fidgetingbits

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeCommand.yml

@@ -0,0 +1,23 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change command
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: command}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ls non_existent_file || echo "File not found"
+  selections:
+    - anchor: {line: 0, character: 26}
+      active: {line: 0, character: 26}
+  marks: {}
+finalState:
+  documentContents: "ls non_existent_file || "
+  selections:
+    - anchor: {line: 0, character: 24}
+      active: {line: 0, character: 24}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeConditionEach.yml

@@ -0,0 +1,37 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change condition each
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: e}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: condition}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    until [ $counter -gt 5 ]
+    do
+      echo "Iteration: $counter"
+      ((counter++))
+    done
+  selections:
+    - anchor: {line: 4, character: 4}
+      active: {line: 4, character: 4}
+  marks:
+    default.e:
+      start: {line: 0, character: 9}
+      end: {line: 0, character: 16}
+finalState:
+  documentContents: |-
+    until 
+    do
+      echo "Iteration: $counter"
+      ((counter++))
+    done
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 6}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeRegexZero.yml

@@ -0,0 +1,41 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change regex zero
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: '0'}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: regularExpression}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |+
+
+    string="The date is 2023-01-01."
+    if [[ $string =~ ([0-9]{4}-[0-9]{2}-[0-9]{2}) ]]; then
+      matched_date="${BASH_REMATCH[1]}"
+      echo "Matched date: $matched_date"
+    fi
+
+  selections:
+    - anchor: {line: 2, character: 5}
+      active: {line: 2, character: 5}
+  marks:
+    default.0:
+      start: {line: 2, character: 19}
+      end: {line: 2, character: 22}
+finalState:
+  documentContents: |+
+
+    string="The date is 2023-01-01."
+    if [[ $string =~  ]]; then
+      matched_date="${BASH_REMATCH[1]}"
+      echo "Matched date: $matched_date"
+    fi
+
+  selections:
+    - anchor: {line: 2, character: 17}
+      active: {line: 2, character: 17}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeState2.yml

@@ -0,0 +1,23 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change state
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: cat <input.txt
+  selections:
+    - anchor: {line: 0, character: 9}
+      active: {line: 0, character: 9}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeState3.yml

@@ -0,0 +1,23 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change state
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ls non_existent_file || echo "File not found"
+  selections:
+    - anchor: {line: 0, character: 19}
+      active: {line: 0, character: 19}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

queries/shellscript.scm

@@ -14,15 +14,20 @@
   (for_statement)
   (function_definition)
   (declaration_command)
+  (case_statement)
+  (subshell)
+  (list)
+  (redirected_statement)
 ] @statement
 
+;;FIXME: Make the #not-parent-type? thing a list of nodes
 (
   (_
     [
       (variable_assignment)
       (command)
     ] @statement
-    (#not-parent-type? @statement declaration_command)
+    (#not-parent-type? @statement declaration_command c_style_for_statement list redirected_statement)
   )
 )