Support "name" and "value" in guard of Python for-each statements (cu…

…rsorless-dev#1919)

- Depends on cursorless-dev#1922,
which migrates `"name"` in Python
- Depends on cursorless-dev#1924, which migrates `value` in Typescript

## Checklist

- [ ] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [ ] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [ ] I have not broken the cheatsheet

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/changeName4.yml

@@ -0,0 +1,23 @@
+languageId: javascript
+command:
+  version: 6
+  spokenForm: change name
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: for (const aaa of bbb) {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: for (const  of bbb) {}
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/changeName5.yml

@@ -0,0 +1,19 @@
+languageId: javascript
+command:
+  version: 6
+  spokenForm: change name
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: for (const aaa of bbb) {}
+  selections:
+    - anchor: {line: 0, character: 24}
+      active: {line: 0, character: 24}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/changeValue4.yml

@@ -0,0 +1,23 @@
+languageId: javascript
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: for (const aaa of bbb) {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: for (const aaa of ) {}
+  selections:
+    - anchor: {line: 0, character: 18}
+      active: {line: 0, character: 18}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/changeValue5.yml

@@ -0,0 +1,19 @@
+languageId: javascript
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: for (const aaa of bbb) {}
+  selections:
+    - anchor: {line: 0, character: 24}
+      active: {line: 0, character: 24}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeName.yml

@@ -0,0 +1,27 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: change name
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    for aaa in bbb:
+        pass
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: |-
+    for  in bbb:
+        pass
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeName2.yml

@@ -0,0 +1,21 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: change name
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    for aaa in bbb:
+        pass
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeValue3.yml

@@ -0,0 +1,27 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    for aaa in bbb:
+        pass
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: |-
+    for aaa in :
+        pass
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeValue4.yml

@@ -0,0 +1,21 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    for aaa in bbb:
+        pass
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

queries/javascript.core.scm

@@ -310,6 +310,20 @@
   (_) @value
 ) @_.domain
 
+;; name:
+;;!! for (const aaa of bbb) {}
+;;!             ^^^
+;;!  ----------------------
+;; value:
+;;!! for (const aaa of bbb) {}
+;;!                    ^^^
+;;!  ----------------------
+(for_in_statement
+  left: (_) @name
+  right: (_) @value
+  ")" @_.domain.end.endOf
+) @_.domain.start.startOf
+
 [
   (program)
   (formal_parameters)

queries/python.scm

@@ -140,6 +140,20 @@
   (_) @value
 ) @_.domain
 
+;; value:
+;;!! for aaa in bbb:
+;;!             ^^^
+;;!  ---------------
+;; name:
+;;!! for aaa in bbb:
+;;!      ^^^
+;;!  ---------------
+(for_statement
+  left: (_) @name
+  right: (_) @value
+  ":" @_.domain.end
+) @_.domain.start.startOf
+
 (comment) @comment @textFragment
 
 (string