Fixed problem with strong containment when cursor is after matching pair (#1574)

Fixes #908

## Checklist

- [x] 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

---------

Co-authored-by: Pokey Rule <[email protected]>

Author: AndreasArvidsson

packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findDelimiterPairContainingSelection.ts

@@ -1,11 +1,14 @@
+import {
+  SimpleSurroundingPairName,
+  SurroundingPairScopeType,
+} from "@cursorless/common";
+import { generateUnmatchedDelimiters } from "./generateUnmatchedDelimiters";
 import { getSurroundingPairOffsets } from "./getSurroundingPairOffsets";
 import {
-  SurroundingPairOffsets,
-  PossibleDelimiterOccurrence,
   Offsets,
+  PossibleDelimiterOccurrence,
+  SurroundingPairOffsets,
 } from "./types";
-import { generateUnmatchedDelimiters } from "./generateUnmatchedDelimiters";
-import { SimpleSurroundingPairName } from "@cursorless/common";
 
 /**
  * Looks for a surrounding pair that contains the selection, returning null if none is found.
@@ -40,6 +43,7 @@ export function findDelimiterPairContainingSelection(
   delimiterOccurrences: PossibleDelimiterOccurrence[],
   acceptableDelimiters: SimpleSurroundingPairName[],
   selectionOffsets: Offsets,
+  scopeType: SurroundingPairScopeType,
 ): SurroundingPairOffsets | null {
   // Accept any delimiter when scanning right
   const acceptableRightDelimiters = acceptableDelimiters;
@@ -86,6 +90,18 @@ export function findDelimiterPairContainingSelection(
     // If left delimiter is left of our selection, we return it.  Otherwise
     // loop back and continue scanning outwards.
     if (leftDelimiterOccurrence.offsets.start <= selectionOffsets.start) {
+      if (
+        scopeType.requireStrongContainment &&
+        !(
+          leftDelimiterOccurrence.offsets.end <= selectionOffsets.start &&
+          rightDelimiterOccurrence.offsets.start >= selectionOffsets.end
+        )
+      ) {
+        // If we require strong containment, continue searching for something
+        // bigger if the selection overlaps either delimiter
+        continue;
+      }
+
       return getSurroundingPairOffsets(
         leftDelimiterOccurrence,
         rightDelimiterOccurrence,

packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findSurroundingPairCore.ts

@@ -74,5 +74,6 @@ export function findSurroundingPairCore(
     delimiterOccurrences,
     acceptableDelimiters,
     selectionOffsets,
+    scopeType,
   );
 }

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/boundedNonWhitespaceSequence/clearEveryShortPaint.yml

@@ -0,0 +1,24 @@
+languageId: markdown
+command:
+  version: 5
+  spokenForm: clear every short paint
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: {type: boundedNonWhitespaceSequence}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'')
+  selections:
+    - anchor: {line: 0, character: 5}
+      active: {line: 0, character: 5}
+  marks: {}
+finalState:
+  documentContents: foo( )
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
+    - anchor: {line: 0, character: 5}
+      active: {line: 0, character: 5}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintPairParen.yml

@@ -22,10 +22,10 @@ initialState:
       start: {line: 0, character: 3}
       end: {line: 0, character: 4}
 finalState:
-  documentContents: foo( )
+  documentContents: " "
   selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
 fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: any}}]}]

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearShortPaint.yml

@@ -0,0 +1,22 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: clear short paint
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: boundedNonWhitespaceSequence}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearShortPaint2.yml

@@ -0,0 +1,22 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: clear short paint
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: boundedNonWhitespaceSequence}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: {line: 0, character: 7}
+      active: {line: 0, character: 7}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearShortPaint3.yml

@@ -0,0 +1,22 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: clear short paint
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: boundedNonWhitespaceSequence}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 6}
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearShortPaint4.yml

@@ -0,0 +1,22 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: clear short paint
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: boundedNonWhitespaceSequence}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}