Added grand scope

cursorless-dev · Dec 13, 2023 · b388490 · b388490
1 parent c6f5600
commit b388490
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 5 deletions.
diff --git a/cursorless-talon/src/modifiers/simple_scope_modifier.py b/cursorless-talon/src/modifiers/simple_scope_modifier.py
@@ -15,7 +15,23 @@
 )
 def cursorless_simple_scope_modifier(m) -> dict[str, Any]:
     """Containing scope, every scope, etc"""
+    if hasattr(m, "cursorless_simple_scope_modifier"):
+        modifier = m.cursorless_simple_scope_modifier
+
+        if modifier == "every":
+            return {
+                "type": "everyScope",
+                "scopeType": m.cursorless_scope_type,
+            }
+
+        if modifier == "grand":
+            return {
+                "type": "containingScope",
+                "scopeType": m.cursorless_scope_type,
+                "ancestorIndex": 1,
+            }
+
     return {
-        "type": "everyScope" if m[0] == "every" else "containingScope",
+        "type": "containingScope",
         "scopeType": m.cursorless_scope_type,
     }
diff --git a/cursorless-talon/src/spoken_forms.json b/cursorless-talon/src/spoken_forms.json
@@ -81,7 +81,7 @@
       "its": "inferPreviousMark",
       "visible": "visible"
     },
-    "simple_scope_modifier": { "every": "every" },
+    "simple_scope_modifier": { "every": "every", "grand": "grand" },
     "interior_modifier": {
       "inside": "interiorOnly"
     },

diff --git a/packages/cursorless-engine/src/generateSpokenForm/primitiveTargetToSpokenForm.ts b/packages/cursorless-engine/src/generateSpokenForm/primitiveTargetToSpokenForm.ts
@@ -49,6 +49,17 @@ export class PrimitiveTargetSpokenFormGenerator {
         throw new NoSpokenFormError(`Modifier '${modifier.type}'`);
 
       case "containingScope":
+        if (modifier.ancestorIndex != null) {
+          if (modifier.ancestorIndex === 1) {
+            return [
+              this.spokenFormMap.modifierExtra.grandScope,
+              this.handleScopeType(modifier.scopeType),
+            ];
+          }
+          throw new NoSpokenFormError(
+            `Modifier '${modifier.type}' with ancestor index != 1`,
+          );
+        }
         return [this.handleScopeType(modifier.scopeType)];
 
       case "everyScope":

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/getContainingScopeTarget.ts b/packages/cursorless-engine/src/processTargets/modifiers/getContainingScopeTarget.ts
@@ -36,8 +36,8 @@ export function getContainingScopeTarget(
       scope = expandFromPosition(
         scopeHandler,
         editor,
-        scope.domain.end,
-        "forward",
+        scope.domain.start,
+        "backward",
         ancestorIndex - 1,
       );
     }

diff --git a/packages/cursorless-engine/src/spokenForms/SpokenFormType.ts b/packages/cursorless-engine/src/spokenForms/SpokenFormType.ts
@@ -60,6 +60,7 @@ type ModifierExtra =
   | "previous"
   | "next"
   | "forward"
-  | "backward";
+  | "backward"
+  | "grandScope";
 
 export type SpokenFormType = keyof SpokenFormMapKeyTypes;
diff --git a/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts b/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts
@@ -133,6 +133,7 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = {
     next: "next",
     forward: "forward",
     backward: "backward",
+    grandScope: "grand",
   },
 
   customRegex: {},

diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/changeGrandState.yml b/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/changeGrandState.yml
@@ -0,0 +1,27 @@
+languageId: javascript
+command:
+  version: 6
+  spokenForm: change grand state
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+          ancestorIndex: 1
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    function myFunk() {
+        const value = 2
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
diff --git a/...s/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/changeGrandState2.yml b/...s/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/changeGrandState2.yml
@@ -0,0 +1,26 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: change grand state
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+          ancestorIndex: 1
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    def my_funk():
+        value = 2
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}