Update spoken forms ad nauseam (#1676)

AndreasArvidsson · web-flow · commit e79c59ee3738 · 2023-07-23T17:12:17.000Z
## Checklist - [ ] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [ ] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [ ] I have not broken the cheatsheet
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml
@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 1
-  spokenForm: bring air to after bat slice past fine
+  spokenForm: bring air after bat slice fine
   action: replaceWithTarget
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml
@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 1
-  spokenForm: bring air to bat slice past fine
+  spokenForm: bring air to bat slice fine
   action: replaceWithTarget
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml
@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 1
-  spokenForm: bring air before bat slice past fine
+  spokenForm: bring air before bat slice fine
   action: replaceWithTarget
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml
@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 1
-  spokenForm: bring air to end of bat slice past fine
+  spokenForm: bring air to end of bat slice fine
   action: replaceWithTarget
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml
@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 1
-  spokenForm: bring air to start of bat slice past fine
+  spokenForm: bring air to start of bat slice fine
   action: replaceWithTarget
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml
@@ -1,7 +1,7 @@
 languageId: plaintext
 command:
   version: 1
-  spokenForm: take bat slice past fine
+  spokenForm: take bat slice fine
   action: setSelection
   targets:
     - type: range
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml
@@ -1,7 +1,7 @@
 languageId: typescript
 command:
   version: 1
-  spokenForm: take fine slice past bat
+  spokenForm: take fine slice bat
   action: setSelection
   targets:
     - type: range
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml
@@ -1,7 +1,7 @@
 languageId: typescript
 command:
   version: 1
-  spokenForm: take slice past fine
+  spokenForm: take slice fine
   action: setSelection
   targets:
     - type: range
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneLines.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneLines.yml
@@ -1,6 +1,6 @@
 languageId: plaintext
 command:
-  spokenForm: change one lines
+  spokenForm: change line forward
   version: 3
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneToken.yml
@@ -1,6 +1,6 @@
 languageId: plaintext
 command:
-  spokenForm: change one token
+  spokenForm: change token forward
   version: 3
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml
@@ -1,6 +1,6 @@
 languageId: plaintext
 command:
-  spokenForm: change one tokens
+  spokenForm: change token forward
   version: 3
   targets:
     - type: primitive
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml
@@ -1,12 +1,22 @@
 languageId: typescript
 command:
-  version: 1
+  version: 3
   spokenForm: take first past second word harp
-  action: setSelection
+  action: {name: setSelection}
   targets:
     - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: 1}
+      modifiers:
+        - type: range
+          anchor:
+            type: ordinalScope
+            scopeType: {type: word}
+            start: 0
+            length: 1
+          active:
+            type: ordinalScope
+            scopeType: {type: word}
+            start: 1
+            length: 1
       mark: {type: decoratedSymbol, symbolColor: default, character: h}
 initialState:
   documentContents: |+
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml
@@ -1,12 +1,22 @@
 languageId: plaintext
 command:
-  version: 1
+  version: 3
   spokenForm: chuck first past second char
-  action: remove
+  action: {name: remove}
   targets:
     - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1, excludeAnchor: false, excludeActive: false}
+      modifiers:
+        - type: range
+          anchor:
+            type: ordinalScope
+            scopeType: {type: character}
+            start: 0
+            length: 1
+          active:
+            type: ordinalScope
+            scopeType: {type: character}
+            start: 1
+            length: 1
 initialState:
   documentContents: foo world whatever
   selections:
