From 197bb16247a45dff3337a3f5a1488335d83a6682 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 5 Dec 2023 15:11:10 +0100 Subject: [PATCH] The change spoken form of word scope to sub (#2089) Fixes #1918 ## Checklist - [-] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [x] 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) - [x] I have not broken the cheatsheet --------- Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com> --- cursorless-talon/src/spoken_forms.json | 2 +- docs/user/README.md | 12 ++++++------ .../src/spokenForms/defaultSpokenFormMapCore.ts | 2 +- .../fixtures/recorded/containingScope/clearWord.yml | 2 +- .../fixtures/recorded/containingScope/clearWord2.yml | 2 +- .../implicitExpansion/chuckSecondWordThat.yml | 2 +- .../clearFirstCarSecondWordHarp.yml | 2 +- .../implicitExpansion/clearFirstWordPastTrap.yml | 2 +- .../implicitExpansion/clearFirstWordThat.yml | 2 +- .../implicitExpansion/clearLeadingSecondWord.yml | 2 +- .../recorded/implicitExpansion/clearSecondWord.yml | 2 +- .../recorded/implicitExpansion/clearSecondWord2.yml | 2 +- .../implicitExpansion/clearSecondWordAir.yml | 2 +- .../fixtures/recorded/inference/takeFirstWord.yml | 2 +- .../recorded/languages/scss/changeFirstWordLook.yml | 2 +- .../recorded/languages/scss/changeLastWordLook.yml | 2 +- .../languages/scss/changeLeadingLastWordLook.yml | 2 +- .../recorded/languages/scss/changeSecondWordLook.yml | 2 +- .../languages/scss/changeTrailingFirstWordLook.yml | 2 +- .../recorded/languages/scss/chuckFirstWordCap.yml | 2 +- .../recorded/languages/scss/chuckLastWordCap.yml | 2 +- .../scss/moveFirstWordZipBeforeFineTakeFine.yml | 2 +- .../scss/moveFirstWordZipBeforeFineTakeZip.yml | 2 +- .../scss/moveLastWordZipAfterFineTakeFine.yml | 2 +- .../scss/moveLastWordZipAfterFineTakeZip.yml | 2 +- .../languages/shellscript/changeThirdWordDash.yml | 2 +- .../languages/shellscript/chuckFirstWordBat.yml | 2 +- .../languages/shellscript/chuckSecondWordCap.yml | 2 +- .../instance/clearTwoInstancesLastWordAir.yml | 2 +- .../fixtures/recorded/selectionTypes/chuckWord.yml | 2 +- .../fixtures/recorded/selectionTypes/chuckWord2.yml | 2 +- .../recorded/selectionTypes/clearNextWord.yml | 2 +- .../recorded/selectionTypes/clearNextWord2.yml | 2 +- .../recorded/selectionTypes/clearNextWord3.yml | 2 +- .../recorded/selectionTypes/clearPreviousWord.yml | 2 +- .../recorded/selectionTypes/clearPreviousWord2.yml | 2 +- .../recorded/selectionTypes/clearPreviousWord3.yml | 2 +- .../recorded/selectionTypes/clearSecondLastWord.yml | 2 +- .../recorded/selectionTypes/clearSecondNextWord.yml | 2 +- .../fixtures/recorded/selectionTypes/clearWord.yml | 2 +- .../fixtures/recorded/selectionTypes/clearWord2.yml | 2 +- .../fixtures/recorded/selectionTypes/clearWord3.yml | 2 +- .../fixtures/recorded/selectionTypes/clearWord4.yml | 2 +- .../fixtures/recorded/selectionTypes/clearWord5.yml | 2 +- .../fixtures/recorded/selectionTypes/clearWord6.yml | 2 +- .../fixtures/recorded/selectionTypes/clearWord7.yml | 2 +- .../recorded/selectionTypes/takeEveryWord.yml | 2 +- .../recorded/subtoken/chuckFinalTwoWords.yml | 2 +- .../recorded/subtoken/chuckFirstTwoWords.yml | 2 +- .../recorded/subtoken/chuckFirstWordVest.yml | 2 +- .../fixtures/recorded/subtoken/chuckLastWord.yml | 2 +- .../fixtures/recorded/subtoken/chuckLastWordVest.yml | 2 +- .../recorded/subtoken/chuckSecondUntilFourthWord.yml | 2 +- .../recorded/subtoken/chuckSecondWordVest.yml | 2 +- .../recorded/subtoken/clearFirstWordVest.yml | 2 +- .../fixtures/recorded/subtoken/clearLastWordVest.yml | 2 +- .../fixtures/recorded/subtoken/clearNextWord.yml | 2 +- .../recorded/subtoken/clearSecondWordVest.yml | 2 +- .../recorded/subtoken/clearSixthNextWord.yml | 2 +- .../recorded/subtoken/ditchFourthWordLine.yml | 2 +- .../fixtures/recorded/subtoken/ditchLastWordLine.yml | 2 +- .../recorded/subtoken/ditchThirdWordLine.yml | 2 +- .../suite/fixtures/recorded/subtoken/pourWord.yml | 2 +- .../suite/fixtures/recorded/subtoken/pourWordAir.yml | 2 +- .../fixtures/recorded/subtoken/takeEveryWordLine.yml | 2 +- .../recorded/subtoken/takeEveryWordLine2.yml | 2 +- .../recorded/subtoken/takeFirstPastLastWordHarp.yml | 2 +- .../subtoken/takeFirstPastSecondWordHarp.yml | 2 +- .../recorded/subtoken/takeFirstTwoWordHarp.yml | 2 +- .../fixtures/recorded/subtoken/takeFirstWord.yml | 2 +- .../recorded/subtoken/takeLastPastFirstWordHarp.yml | 2 +- .../recorded/subtoken/takeLastTwoWordHarp.yml | 2 +- .../fixtures/recorded/subtoken/takeSecondWord.yml | 2 +- .../subtoken/takeThirdPastSecondWordHarp.yml | 2 +- 74 files changed, 79 insertions(+), 79 deletions(-) diff --git a/cursorless-talon/src/spoken_forms.json b/cursorless-talon/src/spoken_forms.json index 40a0fd16b1..886a5d38b6 100644 --- a/cursorless-talon/src/spoken_forms.json +++ b/cursorless-talon/src/spoken_forms.json @@ -154,7 +154,7 @@ "environment": "environment", "command": "command", "char": "character", - "word": "word", + "sub": "word", "token": "token", "identifier": "identifier", "line": "line", diff --git a/docs/user/README.md b/docs/user/README.md index b59629934f..de85a2a0a1 100644 --- a/docs/user/README.md +++ b/docs/user/README.md @@ -217,17 +217,17 @@ For example, the command `take every key [blue] air` will select every key in th ##### Sub-token modifiers -###### `"word"` +###### `"sub"` -If you need to refer to the individual words within a `camelCase`/`snake_case` token, you can use the `"word"` modifier. For example, +If you need to refer to the individual words within a `camelCase`/`snake_case` token, you can use the `"sub"` modifier. For example, -- `"second word air"` -- `"second past fourth word air"` -- `"last word air"` +- `"second sub air"` +- `"second past fourth sub air"` +- `"last sub air"` For example, the following command: - "take second past fourth word blue air" + "take second past fourth sub blue air" Selects the second, third and fourth word in the token containing letter 'a' with a blue hat. diff --git a/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts b/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts index 1b01cba10a..e5ab822428 100644 --- a/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts +++ b/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts @@ -84,7 +84,7 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = { command: "command", // Text-based scope types character: "char", - word: "word", + word: "sub", token: "token", identifier: "identifier", line: "line", diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord.yml index 789bea01d3..e6e6ed5485 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord2.yml index c06833afd2..2350056b8a 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord2.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord2.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml index 90b308ad1b..f0baa72479 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: chuck second word that + spokenForm: chuck second sub that version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml index fce8984fad..67b3761915 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change first char second word harp + spokenForm: change first char second sub harp version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml index 209863677d..a6fbaa1701 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change first word past trap + spokenForm: change first sub past trap version: 2 targets: - type: range diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml index a4e494005c..5ace03b3c0 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change first word that + spokenForm: change first sub that version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml index 468aba064f..51c1d29417 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change leading second word + spokenForm: change leading second sub version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml index 8f2de1c600..5ba8a97ec7 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change second word + spokenForm: change second sub version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml index e5951cf524..05f44a286a 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change second word + spokenForm: change second sub version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml index 36eaee0a16..e2a2d34a27 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change second word air + spokenForm: change second sub air version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeFirstWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeFirstWord.yml index 4d63bcfa15..4993ec7de7 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeFirstWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeFirstWord.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take first word + spokenForm: take first sub action: setSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml index 83e40772bb..e81ae9a303 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: change first word look + spokenForm: change first sub look version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml index 2c6f1014fc..39e8d28c46 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: change last word look + spokenForm: change last sub look version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml index 17e93e642f..37c9b21b24 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: change leading last word look + spokenForm: change leading last sub look version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml index 565e5eb754..de65b729d7 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: change second word look + spokenForm: change second sub look version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml index 41e9701e3d..36037c77e8 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: change trailing first word look + spokenForm: change trailing first sub look version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml index c55307fc14..e341e33eb7 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: chuck first word cap + spokenForm: chuck first sub cap version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml index 7994aebe17..321771187c 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: chuck last word cap + spokenForm: chuck last sub cap version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml index a60a82ecdf..1faf269998 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: move first word zip before fine take fine + spokenForm: move first sub zip before fine take fine version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml index 0fb7e69488..b2d9ad131f 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: move first word zip before fine take zip + spokenForm: move first sub zip before fine take zip version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml index 05867d4286..01f5c33cc2 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: move last word zip after fine take fine + spokenForm: move last sub zip after fine take fine version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml index dfcdc99363..777894ac1e 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: move last word zip after fine take zip + spokenForm: move last sub zip after fine take zip version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml index e2edc51ed9..4a145c8b75 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml @@ -1,6 +1,6 @@ languageId: shellscript command: - spokenForm: change third word dash + spokenForm: change third sub dash version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml index 30560c9909..289cc29b01 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml @@ -1,6 +1,6 @@ languageId: shellscript command: - spokenForm: chuck first word bat + spokenForm: chuck first sub bat version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml index 3b8021321f..043d0dd1cc 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml @@ -1,6 +1,6 @@ languageId: shellscript command: - spokenForm: chuck second word cap + spokenForm: chuck second sub cap version: 2 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/instance/clearTwoInstancesLastWordAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/instance/clearTwoInstancesLastWordAir.yml index 5f69cb2990..ef5a9bdc20 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/instance/clearTwoInstancesLastWordAir.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/instance/clearTwoInstancesLastWordAir.yml @@ -1,7 +1,7 @@ languageId: plaintext command: version: 5 - spokenForm: change two instances last word air + spokenForm: change two instances last sub air action: {name: clearAndSetSelection} targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord.yml index 5a5df0d203..e26f5928c8 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: chuck word + spokenForm: chuck sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord2.yml index 25dc7b1db4..43b7b10eb5 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord2.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord2.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: chuck word + spokenForm: chuck sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord.yml index 2cda1d619f..19ac9f0d01 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change next word + spokenForm: change next sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml index 43611c3416..8a1b3ce29d 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change next word + spokenForm: change next sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml index 2ad91d5baa..012250920b 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change next word + spokenForm: change next sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml index bf4201b662..c9eb862276 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change previous word + spokenForm: change previous sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml index 49412e2290..46afbe7d8a 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change previous word + spokenForm: change previous sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml index 3a55a9b4c8..157394502b 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change previous word + spokenForm: change previous sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml index 1a8c902125..694d5af6d6 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change second last word + spokenForm: change second last sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml index 763e3007fc..cc3985c6ba 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change second next word + spokenForm: change second next sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord.yml index a0cf659fc9..948dcb881e 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord2.yml index cb9001bf96..448b8749dc 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord2.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord2.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord3.yml index 794b2eb762..f6140b222b 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord3.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord3.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord4.yml index e5cd1f1311..1c335d45a8 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord4.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord4.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord5.yml index 3a4ca76b1a..a0c52e5073 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord5.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord5.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord6.yml index 211fb203bc..972f160e11 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord6.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord6.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord7.yml index f697ec29ef..5e720cd217 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord7.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord7.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change word + spokenForm: change sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml index 491ed28f9d..06cba55593 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: take every word + spokenForm: take every sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFinalTwoWords.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFinalTwoWords.yml index 3246fbc665..2a35696d0f 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFinalTwoWords.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFinalTwoWords.yml @@ -1,7 +1,7 @@ languageId: plaintext command: version: 5 - spokenForm: chuck last two words + spokenForm: chuck last two subs action: {name: remove} targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstTwoWords.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstTwoWords.yml index 5ea99839ad..1c7e878d9c 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstTwoWords.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstTwoWords.yml @@ -1,7 +1,7 @@ languageId: plaintext command: version: 5 - spokenForm: chuck first two words + spokenForm: chuck first two subs action: {name: remove} targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml index aa5496a43b..3403901f5d 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: chuck first word vest + spokenForm: chuck first sub vest action: remove targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWord.yml index 71dabf7641..f389f9e03a 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWord.yml @@ -1,6 +1,6 @@ languageId: scss command: - spokenForm: chuck last word + spokenForm: chuck last sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml index a6d920af6e..73778be3f9 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: chuck last word vest + spokenForm: chuck last sub vest action: remove targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondUntilFourthWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondUntilFourthWord.yml index 875414cc40..cc6294be84 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondUntilFourthWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondUntilFourthWord.yml @@ -1,7 +1,7 @@ languageId: plaintext command: version: 6 - spokenForm: chuck second until fourth word + spokenForm: chuck second until fourth sub action: name: remove target: diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml index 09d948e1be..9bbe483a72 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: chuck second word vest + spokenForm: chuck second sub vest action: remove targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml index 1ad63f46aa..1a39ee7f35 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: change first word vest + spokenForm: change first sub vest action: clearAndSetSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastWordVest.yml index 067fdbd46b..fdec406e6f 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastWordVest.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastWordVest.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: change last word vest + spokenForm: change last sub vest action: clearAndSetSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearNextWord.yml index 2083021a33..a407a62dec 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearNextWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearNextWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change next word + spokenForm: change next sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml index f092a04426..fa0538fd32 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: change second word vest + spokenForm: change second sub vest action: clearAndSetSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml index b53b54cf59..c96533da5e 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: change sixth next word + spokenForm: change sixth next sub version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml index 6b528bfdc3..4e2853ab90 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: chuck fourth word line + spokenForm: chuck fourth sub line version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml index fc7b43b573..329cb1d369 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: chuck last word line + spokenForm: chuck last sub line version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml index 0450298a41..0749ff36b0 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: chuck third word line + spokenForm: chuck third sub line version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWord.yml index 4614061fa5..2663ccbf05 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWord.yml @@ -1,7 +1,7 @@ languageId: plaintext command: version: 5 - spokenForm: pour word + spokenForm: pour sub action: {name: editNewLineAfter} targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWordAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWordAir.yml index b97d7671de..234944a452 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWordAir.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/pourWordAir.yml @@ -1,7 +1,7 @@ languageId: plaintext command: version: 5 - spokenForm: pour word air + spokenForm: pour sub air action: {name: editNewLineAfter} targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml index b4e04f9695..de22a5c578 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: take every word line + spokenForm: take every sub line version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml index 7b68b34206..6b185ca04d 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml @@ -1,6 +1,6 @@ languageId: plaintext command: - spokenForm: take every word line + spokenForm: take every sub line version: 3 targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml index eef4fdfe29..226063859e 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take first past last word harp + spokenForm: take first past last sub harp action: setSelection 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 index 1119d12210..a108e17c53 100644 --- 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,7 +1,7 @@ languageId: typescript command: version: 3 - spokenForm: take first past second word harp + spokenForm: take first past second sub harp action: {name: setSelection} targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml index bae6a95e0f..15f387b4dc 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take first two words harp + spokenForm: take first two subs harp action: setSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstWord.yml index edce864d84..edbf4fcf1c 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstWord.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take first word + spokenForm: take first sub action: setSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml index e38f7780a4..413b472672 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take last past first word harp + spokenForm: take last past first sub harp action: setSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml index 8a4f985a2d..1c68bb68ff 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take last two words harp + spokenForm: take last two subs harp action: setSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondWord.yml index 04f841e05d..57a629043e 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondWord.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondWord.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take second word + spokenForm: take second sub action: setSelection targets: - type: primitive diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml index e5b5b9e852..23749334d0 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml +++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml @@ -1,7 +1,7 @@ languageId: typescript command: version: 1 - spokenForm: take third past second word harp + spokenForm: take third past second sub harp action: setSelection targets: - type: primitive