Added deprecated boolean

Author: AndreasArvidsson

cursorless-talon/src/csv_overrides.py

@@ -59,12 +59,13 @@ def csv_get_normalized_ctx():
 
 def init_csv_and_watch_changes(
     filename: str,
-    default_values: ListToSpokenForms | None,
+    default_values: ListToSpokenForms,
     handle_new_values: Optional[Callable[[list[SpokenFormEntry]], None]] = None,
     *,
     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,12 +124,11 @@ def init_csv_and_watch_changes(
         pluralize_lists = []
 
     file_path = get_full_path(filename)
+    is_file = file_path.is_file()
 
-    # No default values and file does not exist. Do nothing.
-    if default_values is None:
-        if not file_path.is_file():
-            return lambda: None
-        default_values = {}
+    # 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)
 
@@ -160,7 +160,7 @@ def on_watch(path, flags):
 
     fs.watch(file_path.parent, on_watch)
 
-    if file_path.is_file():
+    if is_file:
         current_values = update_file(
             path=file_path,
             headers=headers,

cursorless-talon/src/spoken_forms.json

@@ -233,6 +233,12 @@
       "-from": "experimental.setInstanceReference"
     }
   },
+  "experimental/wrapper_snippets.csv": {},
+  "experimental/insertion_snippets.csv": {},
+  "experimental/insertion_snippets_single_phrase.csv": {},
+  "experimental/miscellaneous.csv": {
+    "phrase_terminator": { "over": "phraseTerminator" }
+  },
   "experimental/actions_custom.csv": {},
   "experimental/regex_scope_types.csv": {},
   "hat_styles.csv": {

cursorless-talon/src/spoken_forms.py

@@ -32,9 +32,7 @@ def auto_construct_defaults(
     spoken_forms: dict[str, ListToSpokenForms],
     handle_new_values: Callable[[str, list[SpokenFormEntry]], None],
     f: Callable[
-        Concatenate[
-            str, ListToSpokenForms | None, Callable[[list[SpokenFormEntry]], None], P
-        ],
+        Concatenate[str, ListToSpokenForms, Callable[[list[SpokenFormEntry]], None], P],
         R,
     ],
 ):
@@ -55,7 +53,7 @@ def auto_construct_defaults(
     """
 
     def ret(filename: str, *args: P.args, **kwargs: P.kwargs) -> R:
-        default_values = spoken_forms.get(filename)
+        default_values = spoken_forms[filename]
         return f(
             filename,
             default_values,
@@ -169,23 +167,25 @@ 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",
-            allow_unknown_values=True,
-            default_list_name="phrase_terminator",
+            deprecated=True,
         ),
         # ---
         handle_csv(