Handle words

Author: pokey

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

@@ -160,6 +160,10 @@ function getFilterScopeType(target: Target): ScopeType | null {
     return { type: "token" };
   }
 
+  if (target.isWord) {
+    return { type: "word" };
+  }
+
   return null;
 }
 

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

@@ -37,6 +37,7 @@ export default abstract class BaseTarget implements Target {
   isRaw = false;
   isImplicit = false;
   isNotebookCell = false;
+  isWord = false;
 
   constructor(parameters: CommonTargetParameters) {
     this.state = {

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

@@ -14,6 +14,7 @@ export default class SubTokenWordTarget extends BaseTarget {
   private trailingDelimiterRange_?: Range;
   insertionDelimiter: string;
   isToken = false;
+  isWord = true;
 
   constructor(parameters: SubTokenTargetParameters) {
     super(parameters);

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

@@ -47,6 +47,9 @@ export interface Target {
   /** If true this target should be treated as a token */
   readonly isToken: boolean;
 
+  /** If true this target should be treated as a word */
+  readonly isWord: boolean;
+
   /**
    * If `true`, then this target has an explicit scope type, and so should never
    * be automatically expanded to a containing scope.

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/instants/clearTwoInstancesItsLastWordAir.yml

@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: clear two instances its last word air
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: {type: instance}
+          offset: 0
+          length: 2
+          direction: forward
+        - {type: inferPreviousMark}
+        - type: ordinalScope
+          scopeType: {type: word}
+          start: -1
+          length: 1
+      mark: {type: decoratedSymbol, symbolColor: default, character: a}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    aaaBbb cccBbbb dddBbb
+  selections:
+    - anchor: {line: 1, character: 0}
+      active: {line: 1, character: 0}
+  marks:
+    default.a:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 6}
+finalState:
+  documentContents: |
+    aaa cccBbbb ddd
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+    - anchor: {line: 0, character: 15}
+      active: {line: 0, character: 15}