Merge branch 'main' into migrateSnippets

Author: AndreasArvidsson

cursorless-talon/src/apps/cursorless_vscode.py

@@ -4,6 +4,9 @@
 
 ctx.matches = r"""
 app: vscode
+# Disable Cursorless when VS Code is displaying a native OS dialog during which the command server
+# hotkey will not work.
+not win.title: /^(Open Folder|Open File|Save As|Open Workspace from File|Add Folder to Workspace|Save Workspace)$/i
 """
 
 ctx.tags = ["user.cursorless"]

cursorless-talon/src/cheatsheet/cheat_sheet.py

@@ -128,6 +128,7 @@ def cursorless_cheat_sheet_get_json():
                         "wrapper_only_paired_delimiter",
                         "wrapper_selectable_paired_delimiter",
                         "selectable_only_paired_delimiter",
+                        "surrounding_pair_scope_type",
                     ],
                     "pairedDelimiter",
                 ),

cursorless-talon/src/cheatsheet/sections/scopes.py

@@ -23,4 +23,14 @@ def get_scopes():
                 },
             ],
         },
+        {
+            "id": "pair",
+            "type": "scopeType",
+            "variations": [
+                {
+                    "spokenForm": "<pair>",
+                    "description": "Paired delimiters",
+                },
+            ],
+        },
     ]

cursorless-talon/src/modifiers/simple_scope_modifier.py

@@ -24,7 +24,7 @@
 
 @mod.capture(
     rule=(
-        "[{user.cursorless_every_scope_modifier} | {user.cursorless_ancestor_scope_modifier}] "
+        "[{user.cursorless_every_scope_modifier} | {user.cursorless_ancestor_scope_modifier}+] "
         "<user.cursorless_scope_type>"
     ),
 )
@@ -40,7 +40,7 @@ def cursorless_simple_scope_modifier(m) -> dict[str, Any]:
         return {
             "type": "containingScope",
             "scopeType": m.cursorless_scope_type,
-            "ancestorIndex": 1,
+            "ancestorIndex": len(m.cursorless_ancestor_scope_modifier_list),
         }
 
     if settings.get("user.private_cursorless_use_preferred_scope"):

cursorless-talon/src/spoken_forms.json

@@ -23,6 +23,7 @@
       "drink": "editNewLineBefore",
       "drop": "insertEmptyLineBefore",
       "extract": "extractVariable",
+      "flash": "flashTargets",
       "float": "insertEmptyLineAfter",
       "fold": "foldRegion",
       "follow split": "followLinkAside",

cursorless-talon/src/targets/destination.py

@@ -1,6 +1,6 @@
 from typing import Union
 
-from talon import Context, Module, actions
+from talon import Module
 
 from .target_types import ListDestination, PrimitiveDestination
 
@@ -11,39 +11,12 @@
     desc="Cursorless insertion mode before/after",
 )
 mod.list("cursorless_insertion_mode_to", desc="Cursorless insertion mode to")
-mod.tag(
-    "cursorless_disable_legacy_destination",
-    desc="Disabled the Cursorless legacy destination(to after) support",
-)
-
-ctx = Context()
-ctx.matches = r"""
-tag: user.cursorless_disable_legacy_destination
-"""
 
 
-# DEPRECATED @ 2023-08-01
 @mod.capture(
-    rule="([{user.cursorless_insertion_mode_to}] {user.cursorless_insertion_mode_before_after}) | {user.cursorless_insertion_mode_to}"
-)
-def cursorless_insertion_mode(m) -> str:
-    try:
-        before_after = m.cursorless_insertion_mode_before_after
-        if hasattr(m, "cursorless_insertion_mode_to"):
-            words = m._unmapped
-            actions.app.notify(
-                f"'{' '.join(words)}' is deprecated. Please just say '{words[-1]}'"
-            )
-        return before_after
-    except AttributeError:
-        return "to"
-
-
-@ctx.capture(
-    "user.cursorless_insertion_mode",
     rule="{user.cursorless_insertion_mode_before_after} | {user.cursorless_insertion_mode_to}",
 )
-def cursorless_insertion_mode_ctx(m) -> str:
+def cursorless_insertion_mode(m) -> str:
     try:
         return m.cursorless_insertion_mode_before_after
     except AttributeError:

data/fixtures/recorded/actions/flashToken.yml

@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: flash token
+  action:
+    name: flashTargets
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: token}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: foo
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  thatMark:
+    - type: TokenTarget
+      contentRange:
+        start: {line: 0, character: 0}
+        end: {line: 0, character: 3}
+      isReversed: false
+      hasExplicitRange: true

data/fixtures/recorded/containingScope/changeGrandGrandState.yml

@@ -0,0 +1,29 @@
+languageId: javascript
+command:
+  version: 7
+  spokenForm: change grand grand state
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
+          ancestorIndex: 2
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    class MyClass {
+        myFunk() {
+            console.log("");
+        }
+    }
+  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}

data/fixtures/recorded/surroundingPair/textual/takeOutside25.yml renamed to data/fixtures/recorded/everyScope/changeEveryTokenInside.yml

@@ -1,23 +1,26 @@
 languageId: plaintext
 command:
-  version: 6
-  spokenForm: change pair
+  version: 7
+  spokenForm: change every token inside
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: any}
+        - type: everyScope
+          scopeType: {type: token}
+        - {type: interiorOnly}
   usePrePhraseSnapshot: false
 initialState:
-  documentContents: ([)]
+  documentContents: "'hello world'"
   selections:
     - anchor: {line: 0, character: 1}
       active: {line: 0, character: 1}
   marks: {}
 finalState:
-  documentContents: (
+  documentContents: "' '"
   selections:
     - anchor: {line: 0, character: 1}
       active: {line: 0, character: 1}
+    - anchor: {line: 0, character: 2}
+      active: {line: 0, character: 2}

data/fixtures/recorded/everyScope/changeLastTokenInside.yml

@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: change last token inside
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: {type: token}
+          start: -1
+          length: 1
+        - {type: interiorOnly}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: "'hello world'"
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: "'hello '"
+  selections:
+    - anchor: {line: 0, character: 7}
+      active: {line: 0, character: 7}