Allow using "this" to refer to current token with empty selection

cursorless-talon/src/command.py

@@ -12,6 +12,7 @@
 mod = Module()
 
 CURSORLESS_COMMAND_ID = "cursorless.command"
+CURSORLESS_COMMAND_VERSION = 4
 last_phrase = None
 
 
@@ -136,7 +137,7 @@ def construct_cursorless_command_argument(
         use_pre_phrase_snapshot = False
 
     return {
-        "version": 3,
+        "version": CURSORLESS_COMMAND_VERSION,
         "spokenForm": get_spoken_form(),
         "action": {
             "name": action,

cursorless-talon/src/compound_targets.py

@@ -3,7 +3,7 @@
 from talon import Module
 
 from .connective import default_range_connective
-from .primitive_target import BASE_TARGET
+from .primitive_target import IMPLICIT_TARGET
 
 mod = Module()
 
@@ -46,7 +46,7 @@ def cursorless_range(m) -> dict[str, Any]:
         return primitive_targets[0]
 
     if len(primitive_targets) == 1:
-        anchor = BASE_TARGET.copy()
+        anchor = IMPLICIT_TARGET.copy()
     else:
         anchor = primitive_targets[0]
 

cursorless-talon/src/primitive_target.py

@@ -6,7 +6,7 @@
 mod = Module()
 
 BASE_TARGET: dict[str, Any] = {"type": "primitive"}
-IMPLICIT_TARGET = {"type": "primitive", "isImplicit": True}
+IMPLICIT_TARGET = {"type": "implicit"}
 
 
 @mod.capture(

docs/user/README.md

@@ -111,6 +111,8 @@ The word `"this"` can be used as a mark to refer to the current cursor(s) or sel
 - `"pre funk"`
 - `"chuck line"`
 
+Note that if you say `"this"` with an empty selection, it refers to the token containing your cursor.
+
 ##### `"that"`
 
 The word `"that"` can be used as a mark to refer to the target of the previous cursorless command.

src/actions/InsertSnippet.ts

@@ -5,7 +5,7 @@ import {
   getSelectionInfo,
 } from "../core/updateSelections/updateSelections";
 import ide from "../libs/cursorless-engine/singletons/ide.singleton";
-import ModifyIfUntypedStage from "../processTargets/modifiers/ModifyIfUntypedStage";
+import { ModifyIfUntypedExplicitStage } from "../processTargets/modifiers/ConditionalModifierStages";
 import { Snippet, SnippetDefinition } from "../typings/snippet";
 import { Target } from "../typings/target.types";
 import { Graph } from "../typings/Types";
@@ -30,17 +30,14 @@ export default class InsertSnippet implements Action {
     }
 
     return [
-      new ModifyIfUntypedStage({
-        type: "modifyIfUntyped",
-        modifier: {
-          type: "cascading",
-          modifiers: defaultScopeTypes.map((scopeType) => ({
-            type: "containingScope",
-            scopeType: {
-              type: scopeType,
-            },
-          })),
-        },
+      new ModifyIfUntypedExplicitStage({
+        type: "cascading",
+        modifiers: defaultScopeTypes.map((scopeType) => ({
+          type: "containingScope",
+          scopeType: {
+            type: scopeType,
+          },
+        })),
       }),
     ];
   }

src/actions/WrapWithSnippet.ts

@@ -1,6 +1,6 @@
 import { callFunctionAndUpdateSelections } from "../core/updateSelections/updateSelections";
 import ide from "../libs/cursorless-engine/singletons/ide.singleton";
-import ModifyIfUntypedStage from "../processTargets/modifiers/ModifyIfUntypedStage";
+import { ModifyIfUntypedStage } from "../processTargets/modifiers/ConditionalModifierStages";
 import { Target } from "../typings/target.types";
 import { Graph } from "../typings/Types";
 import {

src/core/commandRunner/typings/CommandV3.types.ts → src/core/commandRunner/typings/CommandV4.types.ts

@@ -1,11 +1,11 @@
 import type { PartialTargetDescriptor } from "./PartialTargetDescriptor.types";
 import type { ActionCommand } from "./ActionCommand";
 
-export interface CommandV3 {
+export interface CommandV4 {
   /**
    * The version number of the command API
    */
-  version: 3;
+  version: 4;
 
   /**
    * The spoken form of the command if issued from a voice command system

src/core/commandRunner/typings/PartialTargetDescriptor.types.ts

@@ -278,7 +278,6 @@ export interface PartialPrimitiveTargetDescriptor {
   type: "primitive";
   mark?: Mark;
   modifiers?: Modifier[];
-  isImplicit?: boolean;
 }
 
 export interface HeadTailModifier {
@@ -350,7 +349,7 @@ export type RangeType = "continuous" | "vertical";
 
 export interface PartialRangeTargetDescriptor {
   type: "range";
-  anchor: PartialPrimitiveTargetDescriptor;
+  anchor: PartialPrimitiveTargetDescriptor | ImplicitTargetDescriptor;
   active: PartialPrimitiveTargetDescriptor;
   excludeAnchor: boolean;
   excludeActive: boolean;
@@ -362,7 +361,12 @@ export interface PartialListTargetDescriptor {
   elements: (PartialPrimitiveTargetDescriptor | PartialRangeTargetDescriptor)[];
 }
 
+export interface ImplicitTargetDescriptor {
+  type: "implicit";
+}
+
 export type PartialTargetDescriptor =
   | PartialPrimitiveTargetDescriptor
   | PartialRangeTargetDescriptor
-  | PartialListTargetDescriptor;
+  | PartialListTargetDescriptor
+  | ImplicitTargetDescriptor;

src/core/commandRunner/typings/command.types.ts

@@ -1,15 +1,16 @@
 import type { ActionCommand } from "./ActionCommand";
 import type { CommandV0, CommandV1 } from "./legacy/CommandV0V1.types";
 import type { CommandV2 } from "./legacy/CommandV2.types";
-import type { CommandV3 } from "./CommandV3.types";
+import type { CommandV3 } from "./legacy/CommandV3.types";
+import type { CommandV4 } from "./CommandV4.types";
 
 export type CommandComplete = Required<Omit<CommandLatest, "spokenForm">> &
   Pick<CommandLatest, "spokenForm"> & { action: Required<ActionCommand> };
 
-export const LATEST_VERSION = 3 as const;
+export const LATEST_VERSION = 4 as const;
 
 export type CommandLatest = Command & {
   version: typeof LATEST_VERSION;
 };
 
-export type Command = CommandV0 | CommandV1 | CommandV2 | CommandV3;
+export type Command = CommandV0 | CommandV1 | CommandV2 | CommandV3 | CommandV4;

src/core/commandRunner/typings/legacy/CommandV3.types.ts

@@ -0,0 +1,95 @@
+import { PartialTargetDescriptorV3 } from "./PartialTargetDescriptorV3.types";
+
+type ActionType =
+  | "callAsFunction"
+  | "clearAndSetSelection"
+  | "copyToClipboard"
+  | "cutToClipboard"
+  | "deselect"
+  | "editNew"
+  | "editNewLineAfter"
+  | "editNewLineBefore"
+  | "executeCommand"
+  | "extractVariable"
+  | "findInWorkspace"
+  | "foldRegion"
+  | "followLink"
+  | "generateSnippet"
+  | "getText"
+  | "highlight"
+  | "indentLine"
+  | "insertCopyAfter"
+  | "insertCopyBefore"
+  | "insertEmptyLineAfter"
+  | "insertEmptyLineBefore"
+  | "insertEmptyLinesAround"
+  | "insertSnippet"
+  | "moveToTarget"
+  | "outdentLine"
+  | "pasteFromClipboard"
+  | "randomizeTargets"
+  | "remove"
+  | "rename"
+  | "replace"
+  | "replaceWithTarget"
+  | "revealDefinition"
+  | "revealTypeDefinition"
+  | "reverseTargets"
+  | "rewrapWithPairedDelimiter"
+  | "scrollToBottom"
+  | "scrollToCenter"
+  | "scrollToTop"
+  | "setSelection"
+  | "setSelectionAfter"
+  | "setSelectionBefore"
+  | "showDebugHover"
+  | "showHover"
+  | "showQuickFix"
+  | "showReferences"
+  | "sortTargets"
+  | "swapTargets"
+  | "toggleLineBreakpoint"
+  | "toggleLineComment"
+  | "unfoldRegion"
+  | "wrapWithPairedDelimiter"
+  | "wrapWithSnippet";
+
+interface ActionCommand {
+  /**
+   * The action to run
+   */
+  name: ActionType;
+
+  /**
+   * A list of arguments expected by the given action.
+   */
+  args?: unknown[];
+}
+
+export interface CommandV3 {
+  /**
+   * The version number of the command API
+   */
+  version: 3;
+
+  /**
+   * The spoken form of the command if issued from a voice command system
+   */
+  spokenForm?: string;
+
+  /**
+   * If the command is issued from a voice command system, this boolean indicates
+   * whether we should use the pre phrase snapshot. Only set this to true if the
+   * voice command system issues a pre phrase signal at the start of every
+   * phrase.
+   */
+  usePrePhraseSnapshot: boolean;
+
+  action: ActionCommand;
+
+  /**
+   * A list of targets expected by the action. Inference will be run on the
+   * targets
+   */
+  targets: PartialTargetDescriptorV3[];
+}