More fixes

Author: AndreasArvidsson

packages/cursorless-engine/src/actions/CutToClipboard.ts

@@ -8,7 +8,7 @@ import {
 import { ide } from "../singletons/ide.singleton";
 import type { Target } from "../typings/target.types";
 import type { Actions } from "./Actions";
-import type { SimpleAction, ActionReturnValue } from "./actions.types";
+import type { ActionReturnValue, SimpleAction } from "./actions.types";
 
 export class CutToClipboard implements SimpleAction {
   constructor(private actions: Actions) {
@@ -21,7 +21,7 @@ export class CutToClipboard implements SimpleAction {
         const { editor, contentRange } = target;
         const removalHighlightRange = target.getRemovalHighlightRange();
 
-        if (isLine(target)) {
+        if (target.behavesLikeLine) {
           return [
             {
               editor,
@@ -63,11 +63,6 @@ export class CutToClipboard implements SimpleAction {
   }
 }
 
-function isLine(target: Target): boolean {
-  const { type } = target;
-  return type === "line" || type === "paragraph" || type === "document";
-}
-
 /** Get the possible leading and trailing overflow ranges of the outside range compared to the inside range */
 function getOutsideOverflow(insideRange: Range, outsideRange: Range): Range[] {
   const { start: insideStart, end: insideEnd } = insideRange;

packages/cursorless-engine/src/actions/EditNew/EditNew.ts

@@ -18,7 +18,9 @@ export class EditNew {
   }
 
   async run(destinations: Destination[]): Promise<ActionReturnValue> {
-    if (destinations.some(({ target }) => target.type === "notebookCell")) {
+    if (
+      destinations.some(({ target }) => target.textualType === "notebookCell")
+    ) {
       // It is not possible to "pour" a notebook cell and something else,
       // because each notebook cell is its own editor, and you can't have
       // cursors in multiple editors.

packages/cursorless-engine/src/actions/Highlight.ts

@@ -33,7 +33,7 @@ export default class Highlight {
         ide().setHighlightRanges(
           highlightId,
           editor,
-          targets.map(toGeneralizedRange),
+          targets.map((t) => toGeneralizedRange(t, t.contentRange)),
         ),
       );
     }

packages/cursorless-engine/src/actions/InsertEmptyLines.ts

@@ -142,11 +142,6 @@ function constructChangeEdit(
 ): EditWithFlashType {
   return {
     ...target.toDestination(insertionMode).constructChangeEdit("", true),
-    isLine: isLine(target),
+    isLine: target.behavesLikeLine,
   };
 }
-
-function isLine(target: Target): boolean {
-  const { type } = target;
-  return type === "line" || type === "paragraph" || type === "document";
-}

packages/cursorless-engine/src/actions/ToggleBreakpoint.ts

@@ -5,7 +5,7 @@ import { containingLineIfUntypedModifier } from "../processTargets/modifiers/com
 import { ide } from "../singletons/ide.singleton";
 import type { Target } from "../typings/target.types";
 import { flashTargets, runOnTargetsForEachEditor } from "../util/targetUtils";
-import type { SimpleAction, ActionReturnValue } from "./actions.types";
+import type { ActionReturnValue, SimpleAction } from "./actions.types";
 
 export default class ToggleBreakpoint implements SimpleAction {
   getFinalStages = () => [
@@ -25,7 +25,7 @@ export default class ToggleBreakpoint implements SimpleAction {
       const breakpointDescriptors: BreakpointDescriptor[] = targets.map(
         (target) => {
           const range = target.contentRange;
-          return isLine(target)
+          return target.behavesLikeLine
             ? {
                 type: "line",
                 startLine: range.start.line,
@@ -48,8 +48,3 @@ export default class ToggleBreakpoint implements SimpleAction {
     };
   }
 }
-
-function isLine(target: Target): boolean {
-  const { type } = target;
-  return type === "line" || type === "paragraph" || type === "document";
-}

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

@@ -1,10 +1,10 @@
 import type { Target } from "../typings/target.types";
 import { isSameType } from "../util/typeUtils";
+import { LineTarget, UntypedTarget } from "./targets";
 import {
   createContinuousLineRange,
   createContinuousRange,
 } from "./targets/util/createContinuousRange";
-import { LineTarget, UntypedTarget } from "./targets";
 
 /**
  * Creates a target consisting of a range between two targets. If the targets
@@ -48,7 +48,7 @@ export function createContinuousRangeTarget(
     }
   }
 
-  if (isLine(startTarget) && isLine(endTarget)) {
+  if (startTarget.behavesLikeLine && endTarget.behavesLikeLine) {
     return new LineTarget({
       editor: startTarget.editor,
       isReversed,
@@ -71,17 +71,12 @@ export function createContinuousRangeTarget(
       includeStart,
       includeEnd,
     ),
-    type:
+    textualType:
       includeStart &&
       includeEnd &&
-      startTarget.type === "token" &&
-      endTarget.type === "token"
+      startTarget.textualType === "token" &&
+      endTarget.textualType === "token"
         ? "token"
         : "character",
   });
 }
-
-function isLine(target: Target): boolean {
-  const { type } = target;
-  return type === "line" || type === "paragraph" || type === "document";
-}

packages/cursorless-engine/src/processTargets/marks/CursorStage.ts

@@ -13,7 +13,7 @@ export class CursorStage implements MarkStage {
           isReversed: selection.selection.isReversed,
           contentRange: selection.selection,
           hasExplicitRange: !selection.selection.isEmpty,
-          type: "character",
+          textualType: "character",
         }),
     );
   }

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

@@ -135,7 +135,7 @@ export class InstanceStage implements ModifierStage {
           contentRange: range,
           editor,
           isReversed: false,
-          type: "character",
+          textualType: "character",
         }),
     );
 
@@ -182,11 +182,11 @@ export class InstanceStage implements ModifierStage {
 }
 
 function getFilterScopeType(target: Target): ScopeType | null {
-  switch (target.type) {
+  switch (target.textualType) {
     case "line":
     case "token":
     case "word":
-      return { type: target.type };
+      return { type: target.textualType };
     default:
       return null;
   }

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

@@ -15,7 +15,7 @@ abstract class PositionStage implements ModifierStage {
     return [
       target.isRaw
         ? new RawSelectionTarget(parameters)
-        : new PlainTarget({ ...parameters, type: "character" }),
+        : new PlainTarget({ ...parameters, textualType: "character" }),
     ];
   }
 

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

@@ -39,7 +39,7 @@ export class CharacterScopeHandler extends NestedScopeHandler {
             editor,
             contentRange: range,
             isReversed,
-            type: "character",
+            textualType: "character",
           }),
         ],
       }),