Clean up

Author: AndreasArvidsson

packages/cursorless-engine/src/processTargets/targets/BaseTarget.ts

@@ -51,7 +51,7 @@ export abstract class BaseTarget<
   isRaw = false;
   isImplicit = false;
   joinAs: JoinAsType = "line";
-  type: TargetType | undefined = undefined;
+  type: TargetType = "token";
 
   constructor(parameters: TParameters & CommonTargetParameters) {
     this.state = {

packages/cursorless-engine/src/processTargets/targets/ImplicitTarget.ts

@@ -1,4 +1,5 @@
 import type { EnforceUndefined } from "@cursorless/common";
+import type { TargetType } from "../../typings/target.types";
 import type { CommonTargetParameters } from "./BaseTarget";
 import { BaseTarget } from "./BaseTarget";
 
@@ -10,6 +11,7 @@ import { BaseTarget } from "./BaseTarget";
  */
 export class ImplicitTarget extends BaseTarget<CommonTargetParameters> {
   instanceType = "ImplicitTarget";
+  type: TargetType = "character";
   insertionDelimiter = "";
   isRaw = true;
   hasExplicitScopeType = false;

packages/cursorless-engine/src/processTargets/targets/PlainTarget.ts

@@ -20,7 +20,7 @@ export class PlainTarget extends BaseTarget<PlainTargetParameters> {
 
   constructor(parameters: PlainTargetParameters) {
     super(parameters);
-    this.type = parameters.type;
+    this.type = parameters.type ?? "token";
     this.insertionDelimiter = parameters.insertionDelimiter ?? "";
   }
 

packages/cursorless-engine/src/processTargets/targets/RawSelectionTarget.ts

@@ -1,4 +1,5 @@
 import type { EnforceUndefined } from "@cursorless/common";
+import type { TargetType } from "../../typings/target.types";
 import type { CommonTargetParameters } from "./BaseTarget";
 import { BaseTarget } from "./BaseTarget";
 
@@ -9,6 +10,7 @@ import { BaseTarget } from "./BaseTarget";
  */
 export class RawSelectionTarget extends BaseTarget<CommonTargetParameters> {
   instanceType = "RawSelectionTarget";
+  type: TargetType = "character";
   insertionDelimiter = "";
   isRaw = true;
 

packages/cursorless-engine/src/typings/target.types.ts

@@ -55,7 +55,8 @@ export interface Target {
   /** Optional prefix. For example, dash or asterisk for a markdown item */
   readonly prefixRange?: Range;
 
-  readonly type: TargetType | undefined;
+  /** Target type. Is this target a line, a token, etc... */
+  readonly type: TargetType;
 
   /** Specifies how a target should be joined */
   readonly joinAs: JoinAsType;