Merge branch 'main' into collectionItemScopeProvider

Author: AndreasArvidsson

cursorless-talon/src/apps/vscode_settings.py

@@ -99,6 +99,7 @@ def vscode_settings_path() -> Path:
                 xdg_config_home / "Code/User/settings.json",
                 xdg_config_home / "VSCodium/User/settings.json",
                 xdg_config_home / "Code - OSS/User/settings.json",
+                xdg_config_home / "Cursor/User/settings.json",
                 flatpak_apps / "com.visualstudio.code/config/Code/User/settings.json",
                 flatpak_apps / "com.vscodium.codium/config/VSCodium/User/settings.json",
                 flatpak_apps

cursorless-talon/src/check_community_repo.py

@@ -0,0 +1,36 @@
+from talon import app, registry
+
+required_captures = [
+    "number_small",
+    "user.any_alphanumeric_key",
+    "user.formatters",
+    "user.ordinals_small",
+]
+
+required_actions = [
+    "user.homophones_get",
+    "user.reformat_text",
+]
+
+
+def on_ready():
+    missing_captures = [
+        capture for capture in required_captures if capture not in registry.captures
+    ]
+    missing_actions = [
+        action for action in required_actions if action not in registry.actions
+    ]
+    errors = []
+    if missing_captures:
+        errors.append(f"Missing captures: {', '.join(missing_captures)}")
+    if missing_actions:
+        errors.append(f"Missing actions: {', '.join(missing_actions)}")
+    if errors:
+        print("\n".join(errors))
+        app.notify(
+            "Please install the community repository",
+            body="https://github.com/talonhub/community",
+        )
+
+
+app.register("ready", on_ready)

cursorless-talon/src/modifiers/ordinal_scope.py

@@ -13,24 +13,24 @@
 @mod.capture(
     rule="<user.ordinals_small> | [<user.ordinals_small>] {user.cursorless_last_modifier}"
 )
-def ordinal_or_last(m) -> int:
+def cursorless_ordinal_or_last(m) -> int:
     """An ordinal or the word 'last'"""
     if m[-1] == "last":
         return -getattr(m, "ordinals_small", 1)
     return m.ordinals_small - 1
 
 
 @mod.capture(
-    rule="<user.ordinal_or_last> [<user.cursorless_range_connective> <user.ordinal_or_last>] <user.cursorless_scope_type>"
+    rule="<user.cursorless_ordinal_or_last> [<user.cursorless_range_connective> <user.cursorless_ordinal_or_last>] <user.cursorless_scope_type>"
 )
 def cursorless_ordinal_range(m) -> dict[str, Any]:
     """Ordinal range"""
     anchor = create_ordinal_scope_modifier(
-        m.cursorless_scope_type, m.ordinal_or_last_list[0]
+        m.cursorless_scope_type, m.cursorless_ordinal_or_last_list[0]
     )
-    if len(m.ordinal_or_last_list) > 1:
+    if len(m.cursorless_ordinal_or_last_list) > 1:
         active = create_ordinal_scope_modifier(
-            m.cursorless_scope_type, m.ordinal_or_last_list[1]
+            m.cursorless_scope_type, m.cursorless_ordinal_or_last_list[1]
         )
         range_connective: RangeConnective = m.cursorless_range_connective
         return {

cursorless-talon/src/modifiers/simple_scope_modifier.py

@@ -16,7 +16,8 @@
 # This is a private setting and should not be used by non Cursorless developers
 mod.setting(
     "private_cursorless_use_preferred_scope",
-    bool,
+    type=bool,
+    default=False,
     desc="Use preferred scope instead of containing scope for all scopes by default (EXPERIMENTAL)",
 )
 
@@ -42,7 +43,7 @@ def cursorless_simple_scope_modifier(m) -> dict[str, Any]:
             "ancestorIndex": 1,
         }
 
-    if settings.get("user.private_cursorless_use_preferred_scope", False):
+    if settings.get("user.private_cursorless_use_preferred_scope"):
         return {
             "type": "preferredScope",
             "scopeType": m.cursorless_scope_type,

dont_clone_monorepo.py

@@ -0,0 +1,17 @@
+"""
+This file exists in our monorepo so that if someone accidentally clones this monorepo
+into their talon folder instead of cursorless-talon, they'll get a helpful error popup
+"""
+
+from talon import app
+
+
+def on_ready():
+    app.notify(
+        "Whoops! You cloned our monorepo instead of cursorless-talon",
+        "Please remove cursorless and clone cursorless-talon instead:",
+        "https://github.com/cursorless-dev/cursorless-talon",
+    )
+
+
+app.register("ready", on_ready)

packages/cursorless-engine/src/processTargets/modifiers/ContainingScopeStage.ts

@@ -34,7 +34,7 @@ export class ContainingScopeStage implements ModifierStage {
   run(target: Target): Target[] {
     const { scopeType, ancestorIndex = 0 } = this.modifier;
 
-    const scopeHandler = this.scopeHandlerFactory.create(
+    const scopeHandler = this.scopeHandlerFactory.maybeCreate(
       scopeType,
       target.editor.document.languageId,
     );

packages/cursorless-engine/src/processTargets/modifiers/EveryScopeStage.ts

@@ -39,7 +39,7 @@ export class EveryScopeStage implements ModifierStage {
     const { scopeType } = this.modifier;
     const { editor, isReversed } = target;
 
-    const scopeHandler = this.scopeHandlerFactory.create(
+    const scopeHandler = this.scopeHandlerFactory.maybeCreate(
       scopeType,
       editor.document.languageId,
     );
@@ -101,7 +101,7 @@ export class EveryScopeStage implements ModifierStage {
     scopeHandlerFactory: ScopeHandlerFactory,
     target: Target,
   ): Range[] {
-    const iterationScopeHandler = scopeHandlerFactory.create(
+    const iterationScopeHandler = scopeHandlerFactory.maybeCreate(
       scopeHandler.iterationScopeType,
       target.editor.document.languageId,
     );

packages/cursorless-engine/src/processTargets/modifiers/PreferredScopeStage.ts

@@ -46,10 +46,6 @@ export class PreferredScopeStage implements ModifierStage {
       target.editor.document.languageId,
     );
 
-    if (scopeHandler == null) {
-      throw Error(`Couldn't create scope handler for: ${scopeType.type}`);
-    }
-
     const closestTargets = getClosestScopeTargets(target, scopeHandler);
 
     if (closestTargets == null) {

packages/cursorless-engine/src/processTargets/modifiers/RelativeScopeStage.ts

@@ -31,7 +31,7 @@ export class RelativeScopeStage implements ModifierStage {
   ) {}
 
   run(target: Target): Target[] {
-    const scopeHandler = this.scopeHandlerFactory.create(
+    const scopeHandler = this.scopeHandlerFactory.maybeCreate(
       this.modifier.scopeType,
       target.editor.document.languageId,
     );

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BoundedScopeHandler.ts

@@ -35,14 +35,14 @@ abstract class BoundedBaseScopeHandler extends BaseScopeHandler {
     this.targetScopeHandler = this.scopeHandlerFactory.create(
       this.targetScopeType,
       this.languageId,
-    )!;
+    );
     this.surroundingPairInteriorScopeHandler = this.scopeHandlerFactory.create(
       {
         type: "surroundingPairInterior",
         delimiter: "any",
       },
       this.languageId,
-    )!;
+    );
   }
 
   get iterationScopeType(): ScopeType {