Migrated surrounding pair scope handler

cursorless-talon/src/modifiers/scopes.py

@@ -15,7 +15,10 @@
 
 
 @mod.capture(
-    rule="{user.cursorless_scope_type} | <user.cursorless_glyph_scope_type> | {user.cursorless_custom_regex_scope_type}"
+    rule="{user.cursorless_scope_type}"
+    " | <user.cursorless_surrounding_pair_scope_type>"
+    " | <user.cursorless_glyph_scope_type>"
+    " | {user.cursorless_custom_regex_scope_type}"
 )
 def cursorless_scope_type(m) -> dict[str, str]:
     """Cursorless scope type singular"""
@@ -24,16 +27,27 @@ def cursorless_scope_type(m) -> dict[str, str]:
     except AttributeError:
         pass
 
+    try:
+        return m.cursorless_surrounding_pair_scope_type
+    except AttributeError:
+        pass
+
     try:
         return m.cursorless_glyph_scope_type
     except AttributeError:
         pass
 
-    return {"type": "customRegex", "regex": m.cursorless_custom_regex_scope_type}
+    return {
+        "type": "customRegex",
+        "regex": m.cursorless_custom_regex_scope_type,
+    }
 
 
 @mod.capture(
-    rule="{user.cursorless_scope_type_plural} | <user.cursorless_glyph_scope_type_plural> | {user.cursorless_custom_regex_scope_type_plural}"
+    rule="{user.cursorless_scope_type_plural}"
+    " | <user.cursorless_surrounding_pair_scope_type>"
+    " | <user.cursorless_glyph_scope_type_plural>"
+    " | {user.cursorless_custom_regex_scope_type_plural}"
 )
 def cursorless_scope_type_plural(m) -> dict[str, str]:
     """Cursorless scope type plural"""
@@ -42,6 +56,11 @@ def cursorless_scope_type_plural(m) -> dict[str, str]:
     except AttributeError:
         pass
 
+    try:
+        return m.cursorless_surrounding_pair_scope_type
+    except AttributeError:
+        pass
+
     try:
         return m.cursorless_glyph_scope_type_plural
     except AttributeError:

cursorless-talon/src/modifiers/surrounding_pair.py

@@ -1,4 +1,3 @@
-from contextlib import suppress
 from typing import Any
 
 from talon import Context, Module
@@ -30,33 +29,15 @@
         "{user.cursorless_surrounding_pair_scope_type}"
     )
 )
-def cursorless_surrounding_pair_scope_type(m) -> str:
+def cursorless_surrounding_pair_scope_type(m) -> dict[str, Any]:
     """Surrounding pair scope type"""
-    try:
-        return m.cursorless_surrounding_pair_scope_type
-    except AttributeError:
-        return m.cursorless_selectable_paired_delimiter
-
 
-@mod.capture(
-    rule="[{user.cursorless_delimiter_force_direction}] <user.cursorless_surrounding_pair_scope_type>"
-)
-def cursorless_surrounding_pair(m) -> dict[str, Any]:
-    """Expand to containing surrounding pair"""
     try:
-        surrounding_pair_scope_type = m.cursorless_surrounding_pair_scope_type
+        delimiter = m.cursorless_surrounding_pair_scope_type
     except AttributeError:
-        surrounding_pair_scope_type = "any"
-
-    scope_type = {
-        "type": "surroundingPair",
-        "delimiter": surrounding_pair_scope_type,
-    }
-
-    with suppress(AttributeError):
-        scope_type["forceDirection"] = m.cursorless_delimiter_force_direction
+        delimiter = m.cursorless_selectable_paired_delimiter
 
     return {
-        "type": "containingScope",
-        "scopeType": scope_type,
+        "type": "surroundingPair",
+        "delimiter": delimiter,
     }

data/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml

@@ -1,13 +1,13 @@
 languageId: python
 command:
   version: 5
-  spokenForm: change quad
+  spokenForm: change string
   action: {name: clearAndSetSelection}
   targets:
     - type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: doubleQuotes}
+          scopeType: {type: surroundingPair, delimiter: string}
   usePrePhraseSnapshot: false
 initialState:
   documentContents: |-

data/fixtures/recorded/surroundingPair/parseTree/typescript/changePair.yml

@@ -0,0 +1,26 @@
+languageId: typescript
+command:
+  version: 7
+  spokenForm: change pair
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: surroundingPair, delimiter: any}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    (
+    // )
+    )
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

data/fixtures/recorded/surroundingPair/textual/changeNextPair.yml

@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: change next pair
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: {type: surroundingPair, delimiter: any}
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ()  ()
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+  marks: {}
+finalState:
+  documentContents: "()  "
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}

data/fixtures/recorded/surroundingPair/textual/changePair.yml

@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: change pair
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: surroundingPair, delimiter: any}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "[]()"
+  selections:
+    - anchor: {line: 0, character: 2}
+      active: {line: 0, character: 2}
+  marks: {}
+finalState:
+  documentContents: "[]"
+  selections:
+    - anchor: {line: 0, character: 2}
+      active: {line: 0, character: 2}

data/fixtures/recorded/surroundingPair/textual/changePairBackward.yml

@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: change pair backward
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: {type: surroundingPair, delimiter: any}
+          offset: 0
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "[]()"
+  selections:
+    - anchor: {line: 0, character: 2}
+      active: {line: 0, character: 2}
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

data/fixtures/recorded/surroundingPair/textual/changePreviousPair.yml

@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: change previous pair
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: {type: surroundingPair, delimiter: any}
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ()  ()
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+  marks: {}
+finalState:
+  documentContents: "  ()"
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

data/fixtures/recorded/surroundingPair/textual/changeTwoPairs.yml

@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: change two pairs
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: {type: surroundingPair, delimiter: any}
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ()()
+  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}