update logic

cursorless-dev · Dec 13, 2023 · ca48a44 · ca48a44
1 parent 984555b
commit ca48a44
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/getContainingScopeTarget.ts b/packages/cursorless-engine/src/processTargets/modifiers/getContainingScopeTarget.ts
@@ -36,9 +36,10 @@ export function getContainingScopeTarget(
       scope = expandFromPosition(
         scopeHandler,
         editor,
-        scope.domain.start,
-        "backward",
-        ancestorIndex - 1,
+        scope.domain.end,
+        "forward",
+        ancestorIndex,
+        true,
       );
     }
 
@@ -86,10 +87,12 @@ function expandFromPosition(
   position: Position,
   direction: Direction,
   ancestorIndex: number,
+  allowAdjacentScopes: boolean = false,
 ): TargetScope | undefined {
   let nextAncestorIndex = 0;
   for (const scope of scopeHandler.generateScopes(editor, position, direction, {
     containment: "required",
+    allowAdjacentScopes,
   })) {
     if (nextAncestorIndex === ancestorIndex) {
       return scope;

diff --git a/...s/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/changeGrandState3.yml b/...s/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/changeGrandState3.yml
@@ -0,0 +1,29 @@
+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: |-
+    class MyClass {
+        myFunk() {
+            
+        }
+    }
+  selections:
+    - anchor: {line: 2, character: 8}
+      active: {line: 2, character: 8}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}