Merge branch 'main' into cssMigration

Author: AndreasArvidsson

.github/workflows/deploy.yaml

@@ -43,13 +43,13 @@ jobs:
 
       - name: Publish to Open VSX Registry
         id: publishToOpenVSX
-        uses: HaaLeo/publish-vscode-extension@v1
+        uses: HaaLeo/publish-vscode-extension@v2
         with:
           pat: ${{ secrets.OPEN_VSX_TOKEN }}
           packagePath: packages/cursorless-vscode/dist
 
       - name: Publish to Visual Studio Marketplace
-        uses: HaaLeo/publish-vscode-extension@v1
+        uses: HaaLeo/publish-vscode-extension@v2
         with:
           pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
           registryUrl: https://marketplace.visualstudio.com

.github/workflows/test.yml

@@ -114,7 +114,7 @@ jobs:
 
       - name: Test create vsix
         id: createVsix
-        uses: HaaLeo/publish-vscode-extension@v1
+        uses: HaaLeo/publish-vscode-extension@v2
         with:
           pat: none
           packagePath: packages/cursorless-vscode/dist

CHANGELOG.md

@@ -0,0 +1,3 @@
+# Change log entries
+
+This directory contains the raw changelog entries that we will one day use to generate proper release notes. Until then, you can read them here, imagining them in their beautiful future form.

changelog/README.md

@@ -65,6 +65,7 @@ def init_csv_and_watch_changes(
     extra_ignored_values: Optional[list[str]] = None,
     extra_allowed_values: Optional[list[str]] = None,
     allow_unknown_values: bool = False,
+    deprecated: bool = False,
     default_list_name: Optional[str] = None,
     headers: list[str] = [SPOKEN_FORM_HEADER, CURSORLESS_IDENTIFIER_HEADER],
     no_update_file: bool = False,
@@ -123,6 +124,12 @@ def init_csv_and_watch_changes(
         pluralize_lists = []
 
     file_path = get_full_path(filename)
+    is_file = file_path.is_file()
+
+    # Deprecated file that doesn't exist. Do nothing.
+    if deprecated and not is_file:
+        return lambda: None
+
     super_default_values = get_super_values(default_values)
 
     file_path.parent.mkdir(parents=True, exist_ok=True)
@@ -151,9 +158,9 @@ def on_watch(path, flags):
                 handle_new_values=handle_new_values,
             )
 
-    fs.watch(str(file_path.parent), on_watch)
+    fs.watch(file_path.parent, on_watch)
 
-    if file_path.is_file():
+    if is_file:
         current_values = update_file(
             path=file_path,
             headers=headers,
@@ -188,7 +195,7 @@ def on_watch(path, flags):
         )
 
     def unsubscribe():
-        fs.unwatch(str(file_path.parent), on_watch)
+        fs.unwatch(file_path.parent, on_watch)
 
     return unsubscribe
 
@@ -385,7 +392,7 @@ def csv_error(path: Path, index: int, message: str, value: str):
         index (int): The index into the file (for error reporting)
         text (str): The text of the error message to report if condition is false
     """
-    print(f"ERROR: {path}:{index+1}: {message} '{value}'")
+    print(f"ERROR: {path}:{index + 1}: {message} '{value}'")
 
 
 def read_file(

cursorless-talon/src/csv_overrides.py

@@ -233,29 +233,9 @@
       "-from": "experimental.setInstanceReference"
     }
   },
-  "experimental/wrapper_snippets.csv": {
-    "wrapper_snippet": {
-      "else": "ifElseStatement.alternative",
-      "funk": "functionDeclaration.body",
-      "if else": "ifElseStatement.consequence",
-      "if": "ifStatement.consequence",
-      "try": "tryCatchStatement.body",
-      "link": "link.text"
-    }
-  },
-  "experimental/insertion_snippets.csv": {
-    "insertion_snippet_no_phrase": {
-      "if": "ifStatement",
-      "if else": "ifElseStatement",
-      "try": "tryCatchStatement"
-    }
-  },
-  "experimental/insertion_snippets_single_phrase.csv": {
-    "insertion_snippet_single_phrase": {
-      "funk": "functionDeclaration.name",
-      "link": "link.text"
-    }
-  },
+  "experimental/wrapper_snippets.csv": {},
+  "experimental/insertion_snippets.csv": {},
+  "experimental/insertion_snippets_single_phrase.csv": {},
   "experimental/miscellaneous.csv": {
     "phrase_terminator": { "over": "phraseTerminator" }
   },

cursorless-talon/src/spoken_forms.json

@@ -167,20 +167,26 @@ def handle_new_values(csv_name: str, values: list[SpokenFormEntry]):
         # DEPRECATED @ 2025-02-01
         handle_csv(
             "experimental/wrapper_snippets.csv",
+            deprecated=True,
             allow_unknown_values=True,
             default_list_name="wrapper_snippet",
         ),
         handle_csv(
             "experimental/insertion_snippets.csv",
+            deprecated=True,
             allow_unknown_values=True,
             default_list_name="insertion_snippet_no_phrase",
         ),
         handle_csv(
             "experimental/insertion_snippets_single_phrase.csv",
+            deprecated=True,
             allow_unknown_values=True,
             default_list_name="insertion_snippet_single_phrase",
         ),
-        handle_csv("experimental/miscellaneous.csv"),
+        handle_csv(
+            "experimental/miscellaneous.csv",
+            deprecated=True,
+        ),
         # ---
         handle_csv(
             "experimental/actions_custom.csv",
@@ -235,7 +241,7 @@ def on_ready():
 
     registry.register("update_captures", update_captures_debounced)
 
-    fs.watch(str(JSON_FILE.parent), on_watch)
+    fs.watch(JSON_FILE.parent, on_watch)
 
 
 app.register("ready", on_ready)

cursorless-talon/src/spoken_forms.py

@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: take each
+  action: {name: setSelection}
+  targets:
+    - type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: e}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}
+  marks:
+    default.e:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 5}
+finalState:
+  documentContents: hello world
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 5}

data/fixtures/recorded/hatTokenMap/takeEach.yml

@@ -0,0 +1,24 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: take each
+  action:
+    name: setSelection
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: e}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}
+  marks:
+    default.e:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 5}
+finalState:
+  documentContents: hello world
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 5}

data/fixtures/recorded/testCaseRecorder/takeEach.yml

@@ -0,0 +1,10 @@
+<div id="me"><div>
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:8-0:12
+          >----<
+0| <div id="me"><div>
+
+[Insertion delimiter] = " "