Added expandToFullLine modifier

Author: AndreasArvidsson

cursorless-talon/src/spoken_forms.json

@@ -89,6 +89,7 @@
       "trailing": "trailing",
       "content": "keepContentFilter",
       "empty": "keepEmptyFilter",
+      "expand": "expandToFullLine",
       "its": "inferPreviousMark",
       "visible": "visible"
     },

data/fixtures/recorded/modifiers/changeExpand.yml

@@ -0,0 +1,22 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: change expand
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - {type: expandToFullLine}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: "    foo "
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/common/src/types/command/PartialTargetDescriptor.types.ts

@@ -397,6 +397,10 @@ export interface TrailingModifier {
   type: "trailing";
 }
 
+export interface ExpandToFullLineModifier {
+  type: "expandToFullLine";
+}
+
 export interface KeepContentFilterModifier {
   type: "keepContentFilter";
 }
@@ -482,6 +486,7 @@ export type Modifier =
   | LeadingModifier
   | TrailingModifier
   | RawSelectionModifier
+  | ExpandToFullLineModifier
   | ModifyIfUntypedModifier
   | FallbackModifier
   | RangeModifier

packages/cursorless-engine/src/processTargets/ModifierStageFactoryImpl.ts

@@ -7,6 +7,7 @@ import { ClassFunctionNameStage } from "./modifiers/ClassFunctionNameStage";
 import { ModifyIfUntypedStage } from "./modifiers/ConditionalModifierStages";
 import { ContainingScopeStage } from "./modifiers/ContainingScopeStage";
 import { EveryScopeStage } from "./modifiers/EveryScopeStage";
+import { ExpandToFullLineStage } from "./modifiers/ExpandToFullLineStage";
 import { FallbackStage } from "./modifiers/FallbackStage";
 import {
   KeepContentFilterStage,
@@ -57,6 +58,8 @@ export class ModifierStageFactoryImpl implements ModifierStageFactory {
         return new LeadingStage(this, modifier);
       case "trailing":
         return new TrailingStage(this, modifier);
+      case "expandToFullLine":
+        return new ExpandToFullLineStage(modifier);
       case "visible":
         return new VisibleStage(modifier);
 

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

@@ -0,0 +1,20 @@
+import type { ExpandToFullLineModifier } from "@cursorless/common";
+import type { Target } from "../../typings/target.types";
+import { expandToFullLine } from "../../util/rangeUtils";
+import type { ModifierStage } from "../PipelineStages.types";
+import { LineTarget, RawSelectionTarget } from "../targets";
+
+export class ExpandToFullLineStage implements ModifierStage {
+  constructor(private modifier: ExpandToFullLineModifier) {}
+
+  run(target: Target): Target[] {
+    const contentRange = expandToFullLine(target.editor, target.contentRange);
+    return [
+      new LineTarget({
+        editor: target.editor,
+        contentRange,
+        isReversed: target.isReversed,
+      }),
+    ];
+  }
+}

packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts

@@ -122,6 +122,7 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = {
     toRawSelection: "just",
     leading: "leading",
     trailing: "trailing",
+    expandToFullLine: "expand",
     keepContentFilter: "content",
     keepEmptyFilter: "empty",
     inferPreviousMark: "its",

packages/cursorless-engine/src/util/getScopeType.ts

@@ -22,6 +22,7 @@ export function getScopeType(modifier: Modifier): ScopeType | undefined {
     case "endOf":
     case "extendThroughStartOf":
     case "extendThroughEndOf":
+    case "expandToFullLine":
     case "fallback":
     case "range":
     case "modifyIfUntyped":