More updates

cursorless-dev · Dec 8, 2023 · 55fedd1 · 55fedd1
1 parent efb53ff
commit 55fedd1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/RelativeExclusiveScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/RelativeExclusiveScopeStage.ts
@@ -3,6 +3,7 @@ import type { Target } from "../../typings/target.types";
 import { ModifierStageFactory } from "../ModifierStageFactory";
 import type { ModifierStage } from "../PipelineStages.types";
 import { constructScopeRangeTarget } from "./constructScopeRangeTarget";
+import { getContainingScopeTarget } from "./getContainingScopeTarget";
 import { getPreferredScopeTouchingPosition } from "./getPreferredScopeTouchingPosition";
 import { runLegacy } from "./relativeScopeLegacy";
 import { ScopeHandlerFactory } from "./scopeHandlers/ScopeHandlerFactory";
@@ -36,13 +37,23 @@ export class RelativeExclusiveScopeStage implements ModifierStage {
     const { isReversed, editor, contentRange } = target;
     const { length: desiredScopeCount, direction, offset } = this.modifier;
 
-    const initialRange =
-      getPreferredScopeTouchingPosition(
-        scopeHandler,
-        editor,
-        direction === "forward" ? contentRange.start : contentRange.end,
-        direction,
-      )?.domain ?? contentRange;
+    const initialRange = (() => {
+      if (contentRange.isEmpty) {
+        return (
+          getPreferredScopeTouchingPosition(
+            scopeHandler,
+            editor,
+            direction === "forward" ? contentRange.start : contentRange.end,
+            direction,
+          )?.domain ?? contentRange
+        );
+      }
+
+      return (
+        getContainingScopeTarget(target, scopeHandler)?.[0].contentRange ??
+        contentRange
+      );
+    })();
 
     const initialPosition =
       direction === "forward" ? initialRange.end : initialRange.start;

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextCall2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextCall2.yml
@@ -19,7 +19,7 @@ initialState:
       active: {line: 0, character: 0}
   marks: {}
 finalState:
-  documentContents: aaa(, ccc()) + ddd()
+  documentContents: "aaa(bbb(), ccc()) + "
   selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
+    - anchor: {line: 0, character: 20}
+      active: {line: 0, character: 20}
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextCall4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextCall4.yml
@@ -19,7 +19,7 @@ initialState:
       active: {line: 0, character: 1}
   marks: {}
 finalState:
-  documentContents: aaa(, ccc()) + ddd()
+  documentContents: "aaa(bbb(), ccc()) + "
   selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
+    - anchor: {line: 0, character: 20}
+      active: {line: 0, character: 20}
diff --git a/.../cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondNextCall.yml b/.../cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondNextCall.yml
@@ -1,14 +1,14 @@
 languageId: ruby
 command:
   version: 5
-  spokenForm: change second next call
+  spokenForm: change next call
   action: {name: clearAndSetSelection}
   targets:
     - type: primitive
       modifiers:
         - type: relativeScope
           scopeType: {type: functionCall}
-          offset: 2
+          offset: 1
           length: 1
           direction: forward
   usePrePhraseSnapshot: true