Better support for c-style for loops

Author: fidgetingbits

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

@@ -0,0 +1,35 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change condition five
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: '5'}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: condition}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |2
+      # C-style for loop
+      for ((i = 1; i <= 5; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 19}
+      active: {line: 1, character: 19}
+  marks:
+    default.5:
+      start: {line: 1, character: 20}
+      end: {line: 1, character: 21}
+finalState:
+  documentContents: |2
+      # C-style for loop
+      for ((i = 1; ; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 15}
+      active: {line: 1, character: 15}

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

@@ -0,0 +1,29 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change name
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    for ((i = 1; i <= 5; i++)); do
+      echo "C-style loop iteration: $i"
+    done
+  selections:
+    - anchor: {line: 0, character: 8}
+      active: {line: 0, character: 8}
+  marks: {}
+finalState:
+  documentContents: |-
+    for (( = 1; i <= 5; i++)); do
+      echo "C-style loop iteration: $i"
+    done
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 6}

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

@@ -0,0 +1,35 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: change value one
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |2
+      # C-style for loop
+      for ((i = 1; i <= 5; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 12}
+      active: {line: 1, character: 12}
+  marks:
+    default.1:
+      start: {line: 1, character: 12}
+      end: {line: 1, character: 13}
+finalState:
+  documentContents: |2
+      # C-style for loop
+      for ((i = ; i <= 5; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 12}
+      active: {line: 1, character: 12}

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

@@ -0,0 +1,35 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: chuck name green sit
+  action:
+    name: remove
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: green, character: i}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |2-
+      # C-style for loop
+      for ((i = 1; i <= 5; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 12}
+      active: {line: 1, character: 12}
+  marks:
+    green.i:
+      start: {line: 1, character: 8}
+      end: {line: 1, character: 9}
+finalState:
+  documentContents: |2-
+      # C-style for loop
+      for ((1; i <= 5; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 8}
+      active: {line: 1, character: 8}

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

@@ -0,0 +1,35 @@
+languageId: shellscript
+command:
+  version: 6
+  spokenForm: chuck value one
+  action:
+    name: remove
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |2
+      # C-style for loop
+      for ((i = 1; i <= 5; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 12}
+      active: {line: 1, character: 12}
+  marks:
+    default.1:
+      start: {line: 1, character: 12}
+      end: {line: 1, character: 13}
+finalState:
+  documentContents: |2
+      # C-style for loop
+      for ((i; i <= 5; i++)); do
+        echo "C-style loop iteration: $i"
+      done
+  selections:
+    - anchor: {line: 1, character: 9}
+      active: {line: 1, character: 9}

queries/shellscript.scm

@@ -270,6 +270,17 @@
   (#not-parent-type? @dummy declaration_command)
 )
 
+;;!! for ((i = 1; i <= 5; i++)); do
+;;!        ^
+;;!        xxxx
+;;!        -----
+(variable_assignment
+  !name
+  (variable_name) @name @_.trailing.start.startOf
+  "="
+  (_) @_.trailing.end.startOf
+) @_.domain
+
 ;;!! local foo="bar"
 ;;!        ^^^
 ;;!  xxxxxxxxxx
@@ -296,6 +307,21 @@
   (#not-parent-type? @dummy declaration_command)
 )
 
+;;!! for ((i = 1; i <= 5; i++)); do
+;;!            ^
+;;!         xxxx
+;;!        -----
+(
+  (variable_assignment
+    !name
+    !value
+    (_) @_.leading.start.endOf
+    "="
+    .
+    (_) @value @_.leading.end.endOf
+  ) @_.domain
+)
+
 (declaration_command
   "local" @_.domain.start.startOf
   (variable_assignment