diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dfe2ddb05b..8b6f14b6c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,15 +14,15 @@ yarn run test ### Adding tests -See [test-case-recorder.md](docs/test-case-recorder.md). +See [test-case-recorder.md](docs/contributing/test-case-recorder.md). ### Adding a new programming language -See [docs](docs/adding-a-new-language.md). +See [docs](docs/contributing/adding-a-new-language.md). ### Adding syntactic scope types to an existing language -See [parse-tree-patterns.md](docs/parse-tree-patterns.md). +See [parse-tree-patterns.md](docs/contributing/parse-tree-patterns.md). ### Changing SVGs diff --git a/docs/architecture/hat-snapshots.md b/docs/architecture/hat-snapshots.md new file mode 100644 index 0000000000..cb1dc08188 --- /dev/null +++ b/docs/architecture/hat-snapshots.md @@ -0,0 +1,7 @@ +# Hat snapshots + +In order to allow long chained command phrases, we take a snapshot of the hat token map at the start of a phrase and continue to use this map during the course of the entire phrase. This way you can be sure that any commands issued during the course of a single phrase that refer to a decorated token will continue to refer to the same logical token no matter what happens in the document during phrase execution. Note that the ranges of tokens will be kept current as the document changes so that they refer to the same logical range, but the same logical token will keep the same key in the hat token map over the course of a phrase. + +To make this work, first the voice engine touches a file within the signals subdirectory of the command server communication directory after the phrase has been parsed but right before execution begins. Then cursorless will check the version of the signal file via the command server signal API. If the signal has been emitted since the last time cursorless took a snapshot of the hat token map, it will take a new snapshot and continue to use that snapshot of the hats until the next time the signal is emitted. Note that the signal transmission is asynchronous so cursorless just needs to make sure to check the version of the signal before it either updates or reads the map. + +![flow diagram](hat-token-map-snapshots.png) diff --git a/docs/architecture/hat-token-map-snapshots.png b/docs/architecture/hat-token-map-snapshots.png new file mode 100644 index 0000000000..c1c808b9bc Binary files /dev/null and b/docs/architecture/hat-token-map-snapshots.png differ diff --git a/docs/adding-a-new-language.md b/docs/contributing/adding-a-new-language.md similarity index 99% rename from docs/adding-a-new-language.md rename to docs/contributing/adding-a-new-language.md index 06343b2842..1fa88e5f05 100644 --- a/docs/adding-a-new-language.md +++ b/docs/contributing/adding-a-new-language.md @@ -11,7 +11,7 @@ for how to add support for a new parser ## 2. Define parse tree patterns in Cursorless -The parse trees exposed by tree-sitter are often pretty close to what we're +The parse trees exposed by tree-sitter are often pretty close to what we``'re looking for, but we often need to look for specific patterns within the parse tree to get the scopes that the user expects. Fortunately, we have a domain-specific language that makes these definitions fairly compact. diff --git a/docs/parse-tree-patterns.md b/docs/contributing/parse-tree-patterns.md similarity index 100% rename from docs/parse-tree-patterns.md rename to docs/contributing/parse-tree-patterns.md diff --git a/docs/test-case-recorder.md b/docs/contributing/test-case-recorder.md similarity index 76% rename from docs/test-case-recorder.md rename to docs/contributing/test-case-recorder.md index 6648fd04b0..06f9d5f0f5 100644 --- a/docs/test-case-recorder.md +++ b/docs/contributing/test-case-recorder.md @@ -56,9 +56,18 @@ and can be run in vscode or via yarn in terminal. ## Changing recorded test cases in bulk -1. Change the `FIXTURE_TRANSFORMATION` function at the top of - [`transformRecordedTests.ts`](../src/scripts/transformRecordedTests.ts) to - perform the transformation you'd like -2. Run `yarn run compile && node ./out/scripts/transformRecordedTests.js` +### Autoformatting -You might find the `transformPrimitiveTargets` function useful for this purpose. +To clean up the formatting of all of the yaml test cases, run `yarn run compile && node ./out/scripts/transformRecordedTests/index.js` + +### Upgrading fixtures + +To upgrade all the test fixtures to the latest command version, run the command `yarn run compile && node ./out/scripts/transformRecordedTests/index.js upgrade`. This command should be idempotent. + +### Custom transformation + +1. Add a new transformation to the `src/scripts/transformRecordedTests/transformations` directory. Look at the existing transformations in that directory for inspiration. +1. Change the value at the `custom` key in `AVAILABLE_TRANSFORMATIONS` at the top of + [`transformRecordedTests/index.ts`](../src/scripts/transformRecordedTests/index.ts) to + point to your new transformation +1. Run `yarn run compile && node ./out/scripts/transformRecordedTests/index.js custom` diff --git a/package.json b/package.json index b259713c2d..53da3b9465 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "url": "https://github.com/pokey/cursorless-vscode.git" }, "engines": { - "vscode": "^1.53.0" + "vscode": "^1.61.0" }, "extensionKind": [ "workspace" @@ -427,7 +427,7 @@ "watch": "tsc -watch -p ./", "pretest": "yarn run compile && yarn run lint && yarn run esbuild", "lint": "eslint src --ext ts", - "test": "node ./out/test/runTest.js" + "test": "env CURSORLESS_TEST=true node ./out/test/runTest.js" }, "devDependencies": { "@types/glob": "^7.1.3", @@ -435,7 +435,7 @@ "@types/mocha": "^8.0.4", "@types/node": "^16.11.3", "@types/sinon": "^10.0.2", - "@types/vscode": "^1.53.0", + "@types/vscode": "^1.61.0", "@typescript-eslint/eslint-plugin": "^4.9.0", "@typescript-eslint/parser": "^4.9.0", "esbuild": "^0.11.12", diff --git a/src/core/Decorations.ts b/src/core/Decorations.ts index e24e6b425d..5a2bfbf1cd 100644 --- a/src/core/Decorations.ts +++ b/src/core/Decorations.ts @@ -11,7 +11,7 @@ import { } from "./constants"; import { readFileSync } from "fs"; import FontMeasurements from "./FontMeasurements"; -import { sortBy } from "lodash"; +import { pull, sortBy } from "lodash"; import getHatThemeColors from "./getHatThemeColors"; import { IndividualHatAdjustmentMap, @@ -20,6 +20,7 @@ import { DEFAULT_VERTICAL_OFFSET_EM, } from "./shapeAdjustments"; import { Graph } from "../typings/Types"; +import isTesting from "../testUtil/isTesting"; export type DecorationMap = { [k in HatStyleName]?: vscode.TextEditorDecorationType; @@ -30,24 +31,66 @@ export interface NamedDecoration { decoration: vscode.TextEditorDecorationType; } +type DecorationChangeListener = () => void; + export default class Decorations { decorations!: NamedDecoration[]; decorationMap!: DecorationMap; - hatStyleMap!: Record; + private hatStyleMap!: Record; hatStyleNames!: HatStyleName[]; + private decorationChangeListeners: DecorationChangeListener[] = []; + private disposables: vscode.Disposable[] = []; constructor(private graph: Graph) { - this.constructDecorations(graph.fontMeasurements); graph.extensionContext.subscriptions.push(this); + + this.recomputeDecorationStyles = this.recomputeDecorationStyles.bind(this); + + this.disposables.push( + vscode.commands.registerCommand( + "cursorless.recomputeDecorationStyles", + () => { + graph.fontMeasurements.clearCache(); + this.recomputeDecorationStyles(); + } + ), + + vscode.workspace.onDidChangeConfiguration(this.recomputeDecorationStyles) + ); + } + + async init() { + await this.graph.fontMeasurements.calculate(); + this.constructDecorations(this.graph.fontMeasurements); } - destroyDecorations() { + /** + * Register to be notified when decoration styles are updated, for example if + * the user enables a new hat style + * @param listener A function to be called when decoration styles are updated + * @returns A function that can be called to unsubscribe from notifications + */ + registerDecorationChangeListener(listener: DecorationChangeListener) { + this.decorationChangeListeners.push(listener); + + return () => { + pull(this.decorationChangeListeners, listener); + }; + } + + private destroyDecorations() { this.decorations.forEach(({ decoration }) => { decoration.dispose(); }); } - constructDecorations(fontMeasurements: FontMeasurements) { + private async recomputeDecorationStyles() { + this.destroyDecorations(); + await this.graph.fontMeasurements.calculate(); + this.constructDecorations(this.graph.fontMeasurements); + } + + private constructDecorations(fontMeasurements: FontMeasurements) { this.constructHatStyleMap(); const userSizeAdjustment = vscode.workspace @@ -125,6 +168,8 @@ export default class Decorations { this.decorationMap = Object.fromEntries( this.decorations.map(({ name, decoration }) => [name, decoration]) ); + + this.decorationChangeListeners.forEach((listener) => listener()); } private constructHatStyleMap() { @@ -146,9 +191,10 @@ export default class Decorations { shapePenalties.default = 0; colorPenalties.default = 0; - const activeHatColors = HAT_COLORS.filter( - (color) => colorEnablement[color] - ); + // So that unit tests don't fail locally if you have some colors disabled + const activeHatColors = isTesting() + ? HAT_COLORS + : HAT_COLORS.filter((color) => colorEnablement[color]); const activeNonDefaultHatShapes = HAT_NON_DEFAULT_SHAPES.filter( (shape) => shapeEnablement[shape] ); @@ -279,5 +325,6 @@ export default class Decorations { dispose() { this.destroyDecorations(); + this.disposables.forEach(({ dispose }) => dispose()); } } diff --git a/src/core/HatAllocator.ts b/src/core/HatAllocator.ts new file mode 100644 index 0000000000..f623731f49 --- /dev/null +++ b/src/core/HatAllocator.ts @@ -0,0 +1,95 @@ +import * as vscode from "vscode"; +import { addDecorationsToEditors } from "../util/addDecorationsToEditor"; +import { DECORATION_DEBOUNCE_DELAY } from "../core/constants"; +import { Graph } from "../typings/Types"; +import { Disposable } from "vscode"; +import { IndividualHatMap } from "./IndividualHatMap"; + +interface Context { + getActiveMap(): Promise; +} + +export class HatAllocator { + private timeoutHandle: NodeJS.Timeout | null = null; + private isActive: boolean; + private disposables: Disposable[] = []; + private disposalFunctions: (() => void)[] = []; + + constructor(private graph: Graph, private context: Context) { + graph.extensionContext.subscriptions.push(this); + + this.isActive = vscode.workspace + .getConfiguration("cursorless") + .get("showOnStart")!; + + this.addDecorationsDebounced = this.addDecorationsDebounced.bind(this); + this.toggleDecorations = this.toggleDecorations.bind(this); + this.clearEditorDecorations = this.clearEditorDecorations.bind(this); + + this.disposalFunctions.push( + graph.decorations.registerDecorationChangeListener( + this.addDecorationsDebounced + ) + ); + + this.disposables.push( + vscode.commands.registerCommand( + "cursorless.toggleDecorations", + this.toggleDecorations + ), + + vscode.window.onDidChangeTextEditorVisibleRanges( + this.addDecorationsDebounced + ), + vscode.window.onDidChangeActiveTextEditor(this.addDecorationsDebounced), + vscode.window.onDidChangeVisibleTextEditors(this.addDecorationsDebounced), + vscode.window.onDidChangeTextEditorSelection( + this.addDecorationsDebounced + ), + vscode.workspace.onDidChangeTextDocument(this.addDecorationsDebounced) + ); + } + + private clearEditorDecorations(editor: vscode.TextEditor) { + this.graph.decorations.decorations.forEach(({ decoration }) => { + editor.setDecorations(decoration, []); + }); + } + + async addDecorations() { + const activeMap = await this.context.getActiveMap(); + + if (this.isActive) { + addDecorationsToEditors(activeMap, this.graph.decorations); + } else { + vscode.window.visibleTextEditors.forEach(this.clearEditorDecorations); + activeMap.clear(); + } + } + + addDecorationsDebounced() { + if (this.timeoutHandle != null) { + clearTimeout(this.timeoutHandle); + } + + this.timeoutHandle = setTimeout(() => { + this.addDecorations(); + + this.timeoutHandle = null; + }, DECORATION_DEBOUNCE_DELAY); + } + + private toggleDecorations() { + this.isActive = !this.isActive; + this.addDecorationsDebounced(); + } + + dispose() { + this.disposables.forEach(({ dispose }) => dispose()); + this.disposalFunctions.forEach((dispose) => dispose()); + + if (this.timeoutHandle != null) { + clearTimeout(this.timeoutHandle); + } + } +} diff --git a/src/core/HatTokenMap.ts b/src/core/HatTokenMap.ts new file mode 100644 index 0000000000..a314ae4546 --- /dev/null +++ b/src/core/HatTokenMap.ts @@ -0,0 +1,154 @@ +import { HatStyleName } from "./constants"; +import { Graph } from "../typings/Types"; +import { IndividualHatMap, ReadOnlyHatMap } from "./IndividualHatMap"; +import { HatAllocator } from "./HatAllocator"; +import { hrtime } from "process"; +import { abs } from "../util/bigint"; + +/** + * Maximum age for the pre-phrase snapshot before we consider it to be stale + */ +const PRE_PHRASE_SNAPSHOT_MAX_AGE_NS = BigInt(6e10); // 60 seconds + +/** + * Maps from (hatStyle, character) pairs to tokens + */ +export default class HatTokenMap { + /** + * This is the active map the changes every time we reallocate hats. It is + * liable to change in the middle of a phrase. + */ + private activeMap: IndividualHatMap; + + /** + * This is a snapshot of the hat map that remains stable over the course of a + * phrase. Ranges will be updated to account for changes to the document, but a + * hat with the same color and shape will refer to the same logical range. + */ + private prePhraseMapSnapshot?: IndividualHatMap; + private prePhraseMapsSnapshotTimestamp: bigint | null = null; + + private lastSignalVersion: string | null = null; + private hatAllocator: HatAllocator; + + constructor(private graph: Graph) { + graph.extensionContext.subscriptions.push(this); + this.activeMap = new IndividualHatMap(graph); + + this.getActiveMap = this.getActiveMap.bind(this); + + this.hatAllocator = new HatAllocator(graph, { + getActiveMap: this.getActiveMap, + }); + } + + init() { + return this.hatAllocator.addDecorations(); + } + + addDecorations() { + return this.hatAllocator.addDecorations(); + } + + static getKey(hatStyle: HatStyleName, character: string) { + return `${hatStyle}.${character}`; + } + + static splitKey(key: string) { + let [hatStyle, character] = key.split("."); + if (character.length === 0) { + // If the character is `.` then it will appear as a zero length string + // due to the way the split on `.` works + character = "."; + } + return { hatStyle: hatStyle as HatStyleName, character }; + } + + private async getActiveMap() { + // NB: We need to take a snapshot of the hat map before we make any + // modifications if it is the beginning of the phrase + await this.maybeTakePrePhraseSnapshot(); + + return this.activeMap; + } + + /** + * Returns a transient, read-only hat map for use during the course of a + * single command. + * + * Please do not hold onto this copy beyond the lifetime of a single command, + * because it will get stale. + * @param usePrePhraseSnapshot Whether to use pre-phrase snapshot + * @returns A readable snapshot of the map + */ + async getReadableMap(usePrePhraseSnapshot: boolean): Promise { + // NB: Take a snapshot before we return the map if it is the beginning of + // the phrase so all commands will get the same map over the course of the + // phrase + await this.maybeTakePrePhraseSnapshot(); + + if (usePrePhraseSnapshot) { + if (this.lastSignalVersion == null) { + console.error( + "Pre phrase snapshot requested but no signal was present; please upgrade command client" + ); + return this.activeMap; + } + + if (this.prePhraseMapSnapshot == null) { + console.error( + "Navigation map pre-phrase snapshot requested, but no snapshot has been taken" + ); + return this.activeMap; + } + + if ( + abs(hrtime.bigint() - this.prePhraseMapsSnapshotTimestamp!) > + PRE_PHRASE_SNAPSHOT_MAX_AGE_NS + ) { + console.error( + "Navigation map pre-phrase snapshot requested, but snapshot is more than a minute old" + ); + return this.activeMap; + } + + return this.prePhraseMapSnapshot; + } + + return this.activeMap; + } + + public dispose() { + this.activeMap.dispose(); + + if (this.prePhraseMapSnapshot != null) { + this.prePhraseMapSnapshot.dispose(); + } + } + + private async maybeTakePrePhraseSnapshot() { + const phraseStartSignal = this.graph.commandServerApi?.signals?.prePhrase; + + if (phraseStartSignal != null) { + const newSignalVersion = await phraseStartSignal.getVersion(); + + if (newSignalVersion !== this.lastSignalVersion) { + console.debug("taking snapshot"); + this.lastSignalVersion = newSignalVersion; + + if (newSignalVersion != null) { + this.takePrePhraseSnapshot(); + } + } + } + } + + private takePrePhraseSnapshot() { + if (this.prePhraseMapSnapshot != null) { + this.prePhraseMapSnapshot.dispose(); + } + + this.prePhraseMapSnapshot = this.activeMap.clone(); + this.prePhraseMapsSnapshotTimestamp = hrtime.bigint(); + } +} diff --git a/src/core/NavigationMap.ts b/src/core/IndividualHatMap.ts similarity index 50% rename from src/core/NavigationMap.ts rename to src/core/IndividualHatMap.ts index 5eb87b63f2..c506cfef25 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/IndividualHatMap.ts @@ -1,11 +1,15 @@ import { TextDocument } from "vscode"; import { HatStyleName } from "./constants"; import { Graph, Token } from "../typings/Types"; +import HatTokenMap from "./HatTokenMap"; -/** - * Maps from (hatStyle, character) pairs to tokens - */ -export default class NavigationMap { +export interface ReadOnlyHatMap { + getEntries(): [string, Token][]; + getToken(hatStyle: HatStyleName, character: string): Token; +} + +export class IndividualHatMap implements ReadOnlyHatMap { + private isExpired: boolean = false; private documentTokenLists: Map = new Map(); private deregisterFunctions: (() => void)[] = []; @@ -13,9 +17,7 @@ export default class NavigationMap { [decoratedCharacter: string]: Token; } = {}; - constructor(private graph: Graph) { - graph.extensionContext.subscriptions.push(this); - } + constructor(private graph: Graph) {} private getDocumentTokenList(document: TextDocument) { const key = document.uri.toString(); @@ -32,40 +34,49 @@ export default class NavigationMap { return currentValue; } - static getKey(hatStyle: HatStyleName, character: string) { - return `${hatStyle}.${character}`; - } + clone() { + const ret = new IndividualHatMap(this.graph); - static splitKey(key: string) { - let [hatStyle, character] = key.split("."); - if (character.length === 0) { - // If the character is `.` then it will appear as a zero length string - // due to the way the split on `.` works - character = "."; - } - return { hatStyle: hatStyle as HatStyleName, character }; + this.getEntries().forEach(([key, token]) => { + ret.addTokenByKey(key, { ...token }); + }); + + return ret; } - public getEntries() { + getEntries() { + this.checkExpired(); return Object.entries(this.map); } - public addToken(hatStyle: HatStyleName, character: string, token: Token) { - this.map[NavigationMap.getKey(hatStyle, character)] = token; + private addTokenByKey(key: string, token: Token) { + this.map[key] = token; this.getDocumentTokenList(token.editor.document).push(token); } - public getToken(hatStyle: HatStyleName, character: string) { - return this.map[NavigationMap.getKey(hatStyle, character)]; + addToken(hatStyle: HatStyleName, character: string, token: Token) { + this.addTokenByKey(HatTokenMap.getKey(hatStyle, character), token); } - public clear() { + getToken(hatStyle: HatStyleName, character: string) { + this.checkExpired(); + return this.map[HatTokenMap.getKey(hatStyle, character)]; + } + + clear() { this.map = {}; this.documentTokenLists = new Map(); this.deregisterFunctions.forEach((func) => func()); } - public dispose() { + checkExpired() { + if (this.isExpired) { + throw Error("Map snapshot has expired"); + } + } + + dispose() { + this.isExpired = true; this.deregisterFunctions.forEach((func) => func()); } } diff --git a/src/core/commandRunner/CommandRunner.ts b/src/core/commandRunner/CommandRunner.ts new file mode 100644 index 0000000000..bc784cd3f3 --- /dev/null +++ b/src/core/commandRunner/CommandRunner.ts @@ -0,0 +1,151 @@ +import * as vscode from "vscode"; +import inferFullTargets from "../inferFullTargets"; +import processTargets from "../../processTargets"; +import { + ActionType, + Graph, + PartialTarget, + ProcessedTargetsContext, +} from "../../typings/Types"; +import { ThatMark } from "../ThatMark"; +import { TestCaseRecorder } from "../../testUtil/TestCaseRecorder"; +import { canonicalizeAndValidateCommand } from "../../util/canonicalizeAndValidateCommand"; +import { SyntaxNode } from "web-tree-sitter"; +import { CommandArgument } from "./types"; +import { isString } from "../../util/type"; + +// TODO: Do this using the graph once we migrate its dependencies onto the graph +export default class CommandRunner { + private disposables: vscode.Disposable[] = []; + + constructor( + private graph: Graph, + private thatMark: ThatMark, + private sourceMark: ThatMark, + private getNodeAtLocation: (location: vscode.Location) => SyntaxNode, + private testCaseRecorder: TestCaseRecorder + ) { + graph.extensionContext.subscriptions.push(this); + + this.runCommandBackwardCompatible = + this.runCommandBackwardCompatible.bind(this); + + this.disposables.push( + vscode.commands.registerCommand( + "cursorless.command", + this.runCommandBackwardCompatible + ) + ); + } + + async runCommand(commandArgument: CommandArgument) { + try { + console.debug(`commandArgument:`); + console.debug(JSON.stringify(commandArgument, null, 3)); + + const { + spokenForm, + action: actionName, + targets: partialTargets, + extraArgs, + usePrePhraseSnapshot, + } = canonicalizeAndValidateCommand(commandArgument); + + const readableHatMap = await this.graph.hatTokenMap.getReadableMap( + usePrePhraseSnapshot + ); + + const action = this.graph.actions[actionName]; + + if (action == null) { + throw new Error(`Unknown action ${actionName}`); + } + + const targets = inferFullTargets( + partialTargets, + action.getTargetPreferences(...extraArgs) + ); + + const processedTargetsContext: ProcessedTargetsContext = { + currentSelections: + vscode.window.activeTextEditor?.selections.map((selection) => ({ + selection, + editor: vscode.window.activeTextEditor!, + })) ?? [], + currentEditor: vscode.window.activeTextEditor, + hatTokenMap: readableHatMap, + thatMark: this.thatMark.exists() ? this.thatMark.get() : [], + sourceMark: this.sourceMark.exists() ? this.sourceMark.get() : [], + getNodeAtLocation: this.getNodeAtLocation, + }; + + const selections = processTargets(processedTargetsContext, targets); + + if (this.testCaseRecorder.active) { + const context = { + targets, + thatMark: this.thatMark, + sourceMark: this.sourceMark, + hatTokenMap: readableHatMap, + spokenForm, + }; + await this.testCaseRecorder.preCommandHook(commandArgument, context); + } + + const { + returnValue, + thatMark: newThatMark, + sourceMark: newSourceMark, + } = await action.run(selections, ...extraArgs); + + this.thatMark.set(newThatMark); + this.sourceMark.set(newSourceMark); + + if (this.testCaseRecorder.active) { + await this.testCaseRecorder.postCommandHook(returnValue); + } + + return returnValue; + } catch (e) { + this.testCaseRecorder.commandErrorHook(); + const err = e as Error; + vscode.window.showErrorMessage(err.message); + console.debug(err.message); + console.debug(err.stack); + throw err; + } + } + + private runCommandBackwardCompatible( + spokenFormOrCommandArgument: string | CommandArgument, + ...rest: unknown[] + ) { + let commandArgument: CommandArgument; + + if (isString(spokenFormOrCommandArgument)) { + const spokenForm = spokenFormOrCommandArgument; + const [action, targets, ...extraArgs] = rest as [ + ActionType, + PartialTarget[], + ...unknown[] + ]; + + commandArgument = { + version: 0, + spokenForm, + action, + targets, + extraArgs, + usePrePhraseSnapshot: false, + }; + } else { + commandArgument = spokenFormOrCommandArgument; + } + + return this.runCommand(commandArgument); + } + + dispose() { + this.disposables.forEach(({ dispose }) => dispose()); + } +} diff --git a/src/core/commandRunner/types.ts b/src/core/commandRunner/types.ts new file mode 100644 index 0000000000..ccd11c0910 --- /dev/null +++ b/src/core/commandRunner/types.ts @@ -0,0 +1,54 @@ +import { ActionType, PartialTarget } from "../../typings/Types"; + +export type CommandArgumentComplete = Required< + Omit +> & + Pick; + +export type CommandArgumentLatest = CommandArgumentV1; +export type CommandArgument = CommandArgumentV0 | CommandArgumentV1; + +interface CommandArgumentV1 extends CommandArgumentV0V1 { + version: 1; +} + +interface CommandArgumentV0 extends CommandArgumentV0V1 { + version: 0; + usePrePhraseSnapshot?: false; +} + +interface CommandArgumentV0V1 { + /** + * The version number of the command API + */ + version: 0 | 1; + + /** + * The spoken form of the command if issued from a voice command system + */ + spokenForm?: string; + + /** + * If the command is issued from a voice command system, this boolean indicates + * whether we should use the pre phrase snapshot. Only set this to true if the + * voice command system issues a pre phrase signal at the start of every + * phrase. + */ + usePrePhraseSnapshot?: boolean; + + /** + * The action to run + */ + action: ActionType; + + /** + * A list of targets expected by the action. Inference will be run on the + * targets + */ + targets: PartialTarget[]; + + /** + * A list of extra arguments expected by the given action. + */ + extraArgs?: unknown[]; +} diff --git a/src/errors.ts b/src/errors.ts index 05ce1de02e..713fc57271 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -1,7 +1,7 @@ export class UnsupportedLanguageError extends Error { constructor(languageId: string) { super( - `Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/main/docs/adding-a-new-language.md` + `Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/main/docs/contributing/adding-a-new-language.md` ); this.name = "UnsupportedLanguageError"; } diff --git a/src/extension.ts b/src/extension.ts index 612076a212..d2d493e871 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,76 +1,26 @@ import * as vscode from "vscode"; -import { addDecorationsToEditors } from "./util/addDecorationsToEditor"; -import { DECORATION_DEBOUNCE_DELAY } from "./core/constants"; import graphFactories from "./util/graphFactories"; -import inferFullTargets from "./core/inferFullTargets"; -import processTargets from "./processTargets"; -import { Graph, PartialTarget, ProcessedTargetsContext } from "./typings/Types"; +import { Graph } from "./typings/Types"; import makeGraph, { FactoryMap } from "./util/makeGraph"; import { logBranchTypes } from "./util/debug"; -import { TestCase } from "./testUtil/TestCase"; import { ThatMark } from "./core/ThatMark"; import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; -import { getParseTreeApi } from "./util/getExtensionApi"; -import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; +import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; +import isTesting from "./testUtil/isTesting"; +import CommandRunner from "./core/commandRunner/CommandRunner"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); - - var isActive = vscode.workspace - .getConfiguration("cursorless") - .get("showOnStart")!; - - function clearEditorDecorations(editor: vscode.TextEditor) { - graph.decorations.decorations.forEach(({ decoration }) => { - editor.setDecorations(decoration, []); - }); - } - - function addDecorations() { - if (isActive) { - addDecorationsToEditors(graph.navigationMap, graph.decorations); - } else { - vscode.window.visibleTextEditors.forEach(clearEditorDecorations); - graph.navigationMap.clear(); - } - } - - var timeoutHandle: NodeJS.Timeout | null = null; - - function addDecorationsDebounced() { - if (timeoutHandle != null) { - clearTimeout(timeoutHandle); - } - - timeoutHandle = setTimeout(() => { - addDecorations(); - - timeoutHandle = null; - }, DECORATION_DEBOUNCE_DELAY); - } - - const toggleDecorationsDisposable = vscode.commands.registerCommand( - "cursorless.toggleDecorations", - () => { - isActive = !isActive; - addDecorationsDebounced(); - } - ); - - const recomputeDecorationStylesDisposable = vscode.commands.registerCommand( - "cursorless.recomputeDecorationStyles", - () => { - graph.fontMeasurements.clearCache(); - recomputeDecorationStyles(); - } - ); + const commandServerApi = await getCommandServerApi(); const graph = makeGraph({ ...graphFactories, extensionContext: () => context, + commandServerApi: () => commandServerApi, } as FactoryMap); graph.snippets.init(); - await graph.fontMeasurements.calculate(); + await graph.decorations.init(); + graph.hatTokenMap.init(); const thatMark = new ThatMark(); const sourceMark = new ThatMark(); @@ -78,12 +28,12 @@ export async function activate(context: vscode.ExtensionContext) { const cursorlessRecordTestCaseDisposable = vscode.commands.registerCommand( "cursorless.recordTestCase", - async (isNavigationMapTest: boolean = false) => { + async (isHatTokenMapTest: boolean = false) => { if (testCaseRecorder.active) { vscode.window.showInformationMessage("Stopped recording test cases"); testCaseRecorder.stop(); } else { - if (await testCaseRecorder.start(isNavigationMapTest)) { + if (await testCaseRecorder.start(isHatTokenMapTest)) { vscode.window.showInformationMessage( `Recording test cases for following commands in:\n${testCaseRecorder.fixtureSubdirectory}` ); @@ -92,133 +42,48 @@ export async function activate(context: vscode.ExtensionContext) { } ); - const cursorlessCommandDisposable = vscode.commands.registerCommand( - "cursorless.command", - async ( - spokenForm: string, - inputActionName: string, - inputPartialTargets: PartialTarget[], - ...inputExtraArgs: unknown[] - ) => { - try { - const { actionName, partialTargets, extraArgs } = - canonicalizeAndValidateCommand( - inputActionName, - inputPartialTargets, - inputExtraArgs - ); - - console.debug(`spokenForm: ${spokenForm}`); - console.debug(`action: ${actionName}`); - console.debug(`partialTargets:`); - console.debug(JSON.stringify(partialTargets, null, 3)); - console.debug(`extraArgs:`); - console.debug(JSON.stringify(extraArgs, null, 3)); - - const action = graph.actions[actionName]; - - if (action == null) { - throw new Error(`Unknown action ${actionName}`); - } - - const targets = inferFullTargets( - partialTargets, - action.getTargetPreferences(...extraArgs) - ); - - const processedTargetsContext: ProcessedTargetsContext = { - currentSelections: - vscode.window.activeTextEditor?.selections.map((selection) => ({ - selection, - editor: vscode.window.activeTextEditor!, - })) ?? [], - currentEditor: vscode.window.activeTextEditor, - navigationMap: graph.navigationMap, - thatMark: thatMark.exists() ? thatMark.get() : [], - sourceMark: sourceMark.exists() ? sourceMark.get() : [], - getNodeAtLocation, - }; - - const selections = processTargets(processedTargetsContext, targets); - - if (testCaseRecorder.active) { - const command = { actionName, partialTargets, extraArgs }; - const context = { - targets, - thatMark, - sourceMark, - navigationMap: graph.navigationMap!, - spokenForm, - }; - await testCaseRecorder.preCommandHook(command, context); - } - - const { - returnValue, - thatMark: newThatMark, - sourceMark: newSourceMark, - } = await action.run(selections, ...extraArgs); - - thatMark.set(newThatMark); - sourceMark.set(newSourceMark); - - if (testCaseRecorder.active) { - await testCaseRecorder.postCommandHook(returnValue); - } - - return returnValue; - - // writeFileSync( - // "/Users/pokey/src/cursorless-vscode/inferFullTargetsTests.jsonl", - // JSON.stringify({ - // input: { context, partialTargets, preferredPositions }, - // expectedOutput: targets, - // }) + "\n", - // { flag: "a" } - // ); - - // writeFileSync( - // "/Users/pokey/src/cursorless-vscode/processTargetsTests.jsonl", - // JSON.stringify({ - // input: { - // context: processedTargetsContext, - // targets, - // }, - // expectedOutput: selections, - // }) + "\n", - // { flag: "a" } - // ); - - // const processedTargets = processTargets(navigationMap!, targets); - } catch (e) { - testCaseRecorder.commandErrorHook(); - const err = e as Error; - vscode.window.showErrorMessage(err.message); - console.debug(err.message); - console.debug(err.stack); - throw err; - } - } + // TODO: Do this using the graph once we migrate its dependencies onto the graph + const commandRunner = new CommandRunner( + graph, + thatMark, + sourceMark, + getNodeAtLocation, + testCaseRecorder ); - addDecorationsDebounced(); - + // Disabled for now. + // See https://github.com/pokey/cursorless-vscode/issues/320 + // vscode.workspace.onDidChangeTextDocument(checkForEditsOutsideViewport) function checkForEditsOutsideViewport(event: vscode.TextDocumentChangeEvent) { + // TODO: Only activate this code during the course of a cursorless action + // Can register pre/post command hooks the way we do with test case recorder + // TODO: Move this thing to a graph component + // TODO: Need to move command executor and test case recorder to graph + // component while we're doing this stuff so it's easier to register the + // hooks + // TODO: Should run this code even if document is not in a visible editor + // as long as we are during the course of a cursorless command. const editor = vscode.window.activeTextEditor; - if (editor == null || editor.document !== event.document) { + + if ( + editor == null || + editor.document !== event.document || + event.reason === vscode.TextDocumentChangeReason.Undo || + event.reason === vscode.TextDocumentChangeReason.Redo + ) { return; } - const { start } = editor.visibleRanges[0]; - const { end } = editor.visibleRanges[editor.visibleRanges.length - 1]; - const ranges = []; - for (const edit of event.contentChanges) { - if ( - edit.range.end.isBeforeOrEqual(start) || - edit.range.start.isAfterOrEqual(end) - ) { - ranges.push(edit.range); - } - } + + const ranges = event.contentChanges + .filter( + (contentChange) => + !editor.visibleRanges.some( + (visibleRange) => + contentChange.range.intersection(visibleRange) != null + ) + ) + .map(({ range }) => range); + if (ranges.length > 0) { ranges.sort((a, b) => a.start.line - b.start.line); const linesText = ranges @@ -230,49 +95,17 @@ export async function activate(context: vscode.ExtensionContext) { } } - function handleEdit(edit: vscode.TextDocumentChangeEvent) { - addDecorationsDebounced(); - - // TODO. Disabled for now because it triggers on undo as well - // wait until next release when there is a cause field - // checkForEditsOutsideViewport(edit); - } - - const recomputeDecorationStyles = async () => { - graph.decorations.destroyDecorations(); - await graph.fontMeasurements.calculate(); - graph.decorations.constructDecorations(graph.fontMeasurements); - addDecorations(); - }; - context.subscriptions.push( - cursorlessCommandDisposable, cursorlessRecordTestCaseDisposable, - toggleDecorationsDisposable, - recomputeDecorationStylesDisposable, - vscode.workspace.onDidChangeConfiguration(recomputeDecorationStyles), - vscode.window.onDidChangeTextEditorVisibleRanges(addDecorationsDebounced), - vscode.window.onDidChangeActiveTextEditor(addDecorationsDebounced), - vscode.window.onDidChangeVisibleTextEditors(addDecorationsDebounced), - vscode.window.onDidChangeTextEditorSelection(addDecorationsDebounced), vscode.window.onDidChangeTextEditorSelection( logBranchTypes(getNodeAtLocation) - ), - vscode.workspace.onDidChangeTextDocument(handleEdit), - { - dispose() { - if (timeoutHandle != null) { - clearTimeout(timeoutHandle); - } - }, - } + ) ); return { - navigationMap: graph.navigationMap, thatMark, sourceMark, - addDecorations, + graph: isTesting() ? graph : undefined, experimental: { registerThirdPartySnippets: graph.snippets.registerThirdPartySnippets, }, diff --git a/src/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts b/src/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts index 8f9ebef480..75f78419c6 100644 --- a/src/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts +++ b/src/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts @@ -2,6 +2,7 @@ import { SimpleSurroundingPairName } from "../../../typings/Types"; import { IndividualDelimiter } from "./types"; import { delimiterToText } from "./delimiterMaps"; import { concat, uniq } from "lodash"; +import { isString } from "../../../util/type"; /** * Given a list of delimiters, returns a list where each element corresponds to @@ -47,7 +48,3 @@ export function getIndividualDelimiters( }); }); } - -function isString(arg: unknown): arg is string { - return typeof arg === "string" || arg instanceof String; -} diff --git a/src/processTargets/processMark.ts b/src/processTargets/processMark.ts index acbf5f5c3a..2e763fe02a 100644 --- a/src/processTargets/processMark.ts +++ b/src/processTargets/processMark.ts @@ -134,7 +134,7 @@ function processDecoratedSymbol( context: ProcessedTargetsContext, mark: DecoratedSymbol ) { - const token = context.navigationMap.getToken( + const token = context.hatTokenMap.getToken( mark.symbolColor, mark.character ); diff --git a/src/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts deleted file mode 100644 index 7065d4d863..0000000000 --- a/src/scripts/transformRecordedTests.ts +++ /dev/null @@ -1,116 +0,0 @@ -import * as fs from "fs"; -import update from "immutability-helper"; -import { promises as fsp } from "fs"; -import * as path from "path"; -import * as yaml from "js-yaml"; -import { TestCaseFixture } from "../testUtil/TestCase"; - -import { walkFilesSync } from "../testUtil/walkSync"; -import serialize from "../testUtil/serialize"; -import canonicalizeActionName from "../util/canonicalizeActionName"; -import { transformPrimitiveTargets } from "../util/getPrimitiveTargets"; -import { DelimiterInclusion, PartialPrimitiveTarget } from "../typings/Types"; -import { mkdir, rename, unlink } from "fs/promises"; - -/** - * The transformation to run on all recorded test fixtures. Change this - * variable to do a custom bulk transformation. - */ -const FIXTURE_TRANSFORMATION: ( - originalFixture: TestCaseFixture -) => TestCaseFixture = identity; - -async function main() { - const directory = path.join( - __dirname, - "../../src/test/suite/fixtures/recorded" - ); - const files = walkFilesSync(directory); - - files.forEach(transformFile); -} - -async function transformFile(file: string) { - const buffer = await fsp.readFile(file); - const inputFixture = yaml.load(buffer.toString()) as TestCaseFixture; - const outputFixture = FIXTURE_TRANSFORMATION(inputFixture); - await fsp.writeFile(file, serialize(outputFixture)); -} - -/** - * Can be used to organize files into directories based on eg language id - * @param file The file to move - */ -async function moveFile(file: string) { - const buffer = await fsp.readFile(file); - const inputFixture = yaml.load(buffer.toString()) as TestCaseFixture; - const parent = path.dirname(file); - if (path.basename(parent) !== "surroundingPair") { - return; - } - const childDirName = - inputFixture.languageId === "plaintext" - ? "textual" - : `parseTree/${inputFixture.languageId}`; - const childDir = path.join(parent, childDirName); - await mkdir(childDir, { recursive: true }); - const outputPath = path.join(childDir, path.basename(file)); - // console.log(`${file} => ${outputPath}`); - await rename(file, outputPath); -} - -// COMMON TRANSFORMATIONS -// ====================== -// Below are some common transformations you might want to run. - -function identity(fixture: TestCaseFixture) { - return fixture; -} - -function canonicalizeActionNames(fixture: TestCaseFixture) { - return update(fixture, { command: { actionName: canonicalizeActionName } }); -} - -function reorderFields(fixture: TestCaseFixture) { - return { - spokenForm: fixture.spokenForm, - languageId: fixture.languageId, - command: fixture.command, - marksToCheck: fixture.marksToCheck, - initialState: fixture.initialState, - finalState: fixture.finalState, - returnValue: fixture.returnValue, - fullTargets: fixture.fullTargets, - }; -} - -// Leaving an example here in case it's helpful -function updateSurroundingPairTest(fixture: TestCaseFixture) { - fixture.command.partialTargets = transformPrimitiveTargets( - fixture.command.partialTargets, - (target: PartialPrimitiveTarget) => { - if (target.modifier?.type === "surroundingPair") { - let delimiterInclusion: DelimiterInclusion; - - switch (target.modifier.delimiterInclusion as any) { - case "includeDelimiters": - delimiterInclusion = undefined; - break; - case "excludeDelimiters": - delimiterInclusion = "interiorOnly"; - break; - case "delimitersOnly": - delimiterInclusion = "excludeInterior"; - break; - } - - target.modifier.delimiterInclusion = delimiterInclusion; - } - return target; - } - ); - - return fixture; -} - -main(); diff --git a/src/scripts/transformRecordedTests/index.ts b/src/scripts/transformRecordedTests/index.ts new file mode 100644 index 0000000000..195f12fb4e --- /dev/null +++ b/src/scripts/transformRecordedTests/index.ts @@ -0,0 +1,35 @@ +import * as path from "path"; + +import { walkFilesSync } from "../../testUtil/walkSync"; +import { updateSurroundingPairTest } from "./transformations/updateSurroundingPairTest"; +import { FixtureTransformation } from "./types"; +import { upgrade } from "./transformations/upgrade"; +import { identity } from "./transformations/identity"; +import { transformFile } from "./transformFile"; + +const AVAILABLE_TRANSFORMATIONS: Record = { + upgrade, + autoFormat: identity, + custom: updateSurroundingPairTest, +}; + +async function main(transformationName: string | undefined) { + const transformation = + transformationName == null + ? identity + : AVAILABLE_TRANSFORMATIONS[transformationName]; + + if (transformation == null) { + throw new Error(`Unknown transformation ${transformationName}`); + } + + const directory = path.join( + __dirname, + "../../../src/test/suite/fixtures/recorded" + ); + const files = walkFilesSync(directory); + + files.forEach((file) => transformFile(transformation, file)); +} + +main(process.argv[2]); diff --git a/src/scripts/transformRecordedTests/moveFile.ts b/src/scripts/transformRecordedTests/moveFile.ts new file mode 100644 index 0000000000..d4b2352f65 --- /dev/null +++ b/src/scripts/transformRecordedTests/moveFile.ts @@ -0,0 +1,27 @@ +import { promises as fsp } from "fs"; +import * as path from "path"; +import * as yaml from "js-yaml"; +import { TestCaseFixture } from "../../testUtil/TestCase"; +import { mkdir, rename } from "fs/promises"; + +/** + * Can be used to organize files into directories based on eg language id + * @param file The file to move + */ +export default async function moveFile(file: string) { + const buffer = await fsp.readFile(file); + const inputFixture = yaml.load(buffer.toString()) as TestCaseFixture; + const parent = path.dirname(file); + if (path.basename(parent) !== "surroundingPair") { + return; + } + const childDirName = + inputFixture.languageId === "plaintext" + ? "textual" + : `parseTree/${inputFixture.languageId}`; + const childDir = path.join(parent, childDirName); + await mkdir(childDir, { recursive: true }); + const outputPath = path.join(childDir, path.basename(file)); + // console.log(`${file} => ${outputPath}`); + await rename(file, outputPath); +} diff --git a/src/scripts/transformRecordedTests/transformFile.ts b/src/scripts/transformRecordedTests/transformFile.ts new file mode 100644 index 0000000000..0caa41bc84 --- /dev/null +++ b/src/scripts/transformRecordedTests/transformFile.ts @@ -0,0 +1,14 @@ +import { promises as fsp } from "fs"; +import * as yaml from "js-yaml"; +import { TestCaseFixture } from "../../testUtil/TestCase"; +import serialize from "../../testUtil/serialize"; +import { FixtureTransformation } from "./types"; + +export async function transformFile( + transformation: FixtureTransformation, + file: string) { + const buffer = await fsp.readFile(file); + const inputFixture = yaml.load(buffer.toString()) as TestCaseFixture; + const outputFixture = transformation(inputFixture); + await fsp.writeFile(file, serialize(outputFixture)); +} diff --git a/src/scripts/transformRecordedTests/transformations/identity.ts b/src/scripts/transformRecordedTests/transformations/identity.ts new file mode 100644 index 0000000000..fdae966fcf --- /dev/null +++ b/src/scripts/transformRecordedTests/transformations/identity.ts @@ -0,0 +1,5 @@ +import { TestCaseFixture } from "../../../testUtil/TestCase"; + +export function identity(fixture: TestCaseFixture) { + return fixture; +} diff --git a/src/scripts/transformRecordedTests/transformations/reorderFields.ts b/src/scripts/transformRecordedTests/transformations/reorderFields.ts new file mode 100644 index 0000000000..ae31011a8c --- /dev/null +++ b/src/scripts/transformRecordedTests/transformations/reorderFields.ts @@ -0,0 +1,13 @@ +import { TestCaseFixture } from "../../../testUtil/TestCase"; + +export function reorderFields(fixture: TestCaseFixture) { + return { + languageId: fixture.languageId, + command: fixture.command, + marksToCheck: fixture.marksToCheck, + initialState: fixture.initialState, + finalState: fixture.finalState, + returnValue: fixture.returnValue, + fullTargets: fixture.fullTargets, + }; +} diff --git a/src/scripts/transformRecordedTests/transformations/updateSurroundingPairTest.ts b/src/scripts/transformRecordedTests/transformations/updateSurroundingPairTest.ts new file mode 100644 index 0000000000..eb133bb6fd --- /dev/null +++ b/src/scripts/transformRecordedTests/transformations/updateSurroundingPairTest.ts @@ -0,0 +1,35 @@ +import { TestCaseFixture } from "../../../testUtil/TestCase"; +import { transformPartialPrimitiveTargets } from "../../../util/getPrimitiveTargets"; +import { + DelimiterInclusion, + PartialPrimitiveTarget +} from "../../../typings/Types"; + +// Leaving an example here in case it's helpful +export function updateSurroundingPairTest(fixture: TestCaseFixture) { + fixture.command.targets = transformPartialPrimitiveTargets( + fixture.command.targets, + (target: PartialPrimitiveTarget) => { + if (target.modifier?.type === "surroundingPair") { + let delimiterInclusion: DelimiterInclusion; + + switch (target.modifier.delimiterInclusion as any) { + case "includeDelimiters": + delimiterInclusion = undefined; + break; + case "excludeDelimiters": + delimiterInclusion = "interiorOnly"; + break; + case "delimitersOnly": + delimiterInclusion = "excludeInterior"; + break; + } + + target.modifier.delimiterInclusion = delimiterInclusion; + } + return target; + } + ); + + return fixture; +} diff --git a/src/scripts/transformRecordedTests/transformations/upgrade.ts b/src/scripts/transformRecordedTests/transformations/upgrade.ts new file mode 100644 index 0000000000..b9cb93b2a8 --- /dev/null +++ b/src/scripts/transformRecordedTests/transformations/upgrade.ts @@ -0,0 +1,17 @@ +import { TestCaseFixture } from "../../../testUtil/TestCase"; +import { canonicalizeAndValidateCommand } from "../../../util/canonicalizeAndValidateCommand"; +import { flow } from "lodash"; +import { cleanUpTestCaseCommand } from "../../../testUtil/cleanUpTestCaseCommand"; +import { upgradeFromVersion0 } from "./upgradeFromVersion0"; +import { reorderFields } from "./reorderFields"; + +export const upgrade = flow(upgradeFromVersion0, upgradeCommand, reorderFields); + +function upgradeCommand(fixture: TestCaseFixture) { + fixture.command = flow( + canonicalizeAndValidateCommand, + cleanUpTestCaseCommand + )(fixture.command); + + return fixture; +} diff --git a/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts b/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts new file mode 100644 index 0000000000..5e878f4a43 --- /dev/null +++ b/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts @@ -0,0 +1,37 @@ +import { TestCaseFixture } from "../../../testUtil/TestCase"; +import { transformPartialPrimitiveTargets } from "../../../util/getPrimitiveTargets"; +import { PartialPrimitiveTarget } from "../../../typings/Types"; + +export function upgradeFromVersion0(fixture: TestCaseFixture) { + const { command, spokenForm: oldSpokenForm, ...rest } = fixture as any; + + const { + spokenForm: newSpokenForm, + actionName: oldAction, + action: newAction, + partialTargets: oldTargets, + targets: newTargets, + extraArgs, + } = command; + + const targets = transformPartialPrimitiveTargets( + newTargets ?? oldTargets, + (target: PartialPrimitiveTarget) => { + if (target.mark?.type === "decoratedSymbol") { + (target.mark as any).usePrePhraseSnapshot = undefined; + } + return target; + } + ); + + return { + command: { + version: 1, + spokenForm: newSpokenForm ?? oldSpokenForm, + action: newAction ?? oldAction, + targets, + extraArgs, + }, + ...rest, + }; +} diff --git a/src/scripts/transformRecordedTests/types.ts b/src/scripts/transformRecordedTests/types.ts new file mode 100644 index 0000000000..6ce6b10d2c --- /dev/null +++ b/src/scripts/transformRecordedTests/types.ts @@ -0,0 +1,5 @@ +import { TestCaseFixture } from "../../testUtil/TestCase"; + +export type FixtureTransformation = ( + originalFixture: TestCaseFixture +) => TestCaseFixture; diff --git a/src/test/mockPrePhraseGetVersion.ts b/src/test/mockPrePhraseGetVersion.ts new file mode 100644 index 0000000000..fc9894f3e8 --- /dev/null +++ b/src/test/mockPrePhraseGetVersion.ts @@ -0,0 +1,15 @@ +import * as sinon from "sinon"; +import { Graph } from "../typings/Types"; + +export function mockPrePhraseGetVersion( + graph: Graph, + getVersion: () => Promise +) { + sinon.replaceGetter(graph, "commandServerApi", () => ({ + signals: { + prePhrase: { + getVersion, + }, + }, + })); +} diff --git a/src/test/openNewEditor.ts b/src/test/openNewEditor.ts new file mode 100644 index 0000000000..d05a3d54ba --- /dev/null +++ b/src/test/openNewEditor.ts @@ -0,0 +1,18 @@ +import * as vscode from "vscode"; +import { getParseTreeApi } from "../util/getExtensionApi"; + +export async function openNewEditor( + content: string, + language: string = "plaintext" +) { + await vscode.commands.executeCommand("workbench.action.closeAllEditors"); + + const document = await vscode.workspace.openTextDocument({ + language, + content, + }); + + await (await getParseTreeApi()).loadLanguage(language); + + return await vscode.window.showTextDocument(document); +} diff --git a/src/test/suite/backwardCompatibility.test.ts b/src/test/suite/backwardCompatibility.test.ts new file mode 100644 index 0000000000..4300a90a1f --- /dev/null +++ b/src/test/suite/backwardCompatibility.test.ts @@ -0,0 +1,37 @@ +import * as assert from "assert"; +import * as vscode from "vscode"; +import * as sinon from "sinon"; +import { getCursorlessApi } from "../../util/getExtensionApi"; +import { openNewEditor } from "../openNewEditor"; + +suite("Backward compatibility", async function () { + this.timeout("100s"); + this.retries(3); + + teardown(() => { + sinon.restore(); + }); + + test("Backward compatibility", runTest); +}); + +async function runTest() { + const graph = (await getCursorlessApi()).graph!; + + const editor = await openNewEditor(""); + + editor.selections = [new vscode.Selection(0, 0, 0, 0)]; + + await graph.hatTokenMap.addDecorations(); + + await vscode.commands.executeCommand( + "cursorless.command", + "whatever", + "wrapWithPairedDelimiter", + [{ type: "primitive", selectionType: "line", mark: { type: "cursor" } }], + "(", + ")" + ); + + assert.deepStrictEqual(editor.document.getText(), "()"); +} diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml index a376eb3ab5..c3cea3e3fa 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml @@ -1,8 +1,9 @@ -spokenForm: bring air and bat and cap languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air and bat and cap + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -17,7 +18,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] initialState: documentContents: |+ a diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml index 6a9b28a48d..677b64079d 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml @@ -1,8 +1,9 @@ -spokenForm: bring air and bat and cap to after drum languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air and bat and cap to after drum + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -14,7 +15,6 @@ command: - type: primitive position: after mark: {type: decoratedSymbol, symbolColor: default, character: d} - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml index 055e49c06f..5e350fe8ae 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml @@ -1,8 +1,9 @@ -spokenForm: bring air and bat and cap to after item each languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air and bat and cap to after item each + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -15,7 +16,6 @@ command: position: after modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: e} - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml index 8f3cfefe3a..ffaf9567ea 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml @@ -1,8 +1,9 @@ -spokenForm: bring air and bat and cap to before drum languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air and bat and cap to before drum + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -14,7 +15,6 @@ command: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: d} - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml index c04aeabd7c..59a4395e1b 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml @@ -1,8 +1,9 @@ -spokenForm: bring air and bat and cap to before item each languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air and bat and cap to before item each + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -15,7 +16,6 @@ command: position: before modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: e} - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml index ed8e02337c..93166911b7 100644 --- a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml @@ -1,8 +1,9 @@ -spokenForm: bring line air and bat and cap to after drum languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring line air and bat and cap to after drum + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -15,7 +16,6 @@ command: - type: primitive position: after mark: {type: decoratedSymbol, symbolColor: default, character: d} - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml index 58898ddbcb..9811e5e7f0 100644 --- a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml @@ -1,8 +1,9 @@ -spokenForm: bring line air and bat and cap to before drum languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring line air and bat and cap to before drum + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -15,7 +16,6 @@ command: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: d} - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/actions/bringVest.yml b/src/test/suite/fixtures/recorded/actions/bringVest.yml index 56f3364f2f..c2faaf9f20 100644 --- a/src/test/suite/fixtures/recorded/actions/bringVest.yml +++ b/src/test/suite/fixtures/recorded/actions/bringVest.yml @@ -1,8 +1,9 @@ -spokenForm: bring vest languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring vest + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive @@ -11,7 +12,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml b/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml index f81b3163e1..e7a8553e87 100644 --- a/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml +++ b/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml @@ -1,13 +1,13 @@ -spokenForm: bring vest to cap languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring vest to cap + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/callFine.yml b/src/test/suite/fixtures/recorded/actions/callFine.yml index 1319cceeed..3ee548caf9 100644 --- a/src/test/suite/fixtures/recorded/actions/callFine.yml +++ b/src/test/suite/fixtures/recorded/actions/callFine.yml @@ -1,8 +1,9 @@ -spokenForm: call fine languageId: typescript command: - actionName: callAsFunction - partialTargets: + version: 1 + spokenForm: call fine + action: callAsFunction + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive @@ -11,7 +12,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] initialState: documentContents: |- foo; diff --git a/src/test/suite/fixtures/recorded/actions/callVest.yml b/src/test/suite/fixtures/recorded/actions/callVest.yml index 66022e8345..6d89f5d179 100644 --- a/src/test/suite/fixtures/recorded/actions/callVest.yml +++ b/src/test/suite/fixtures/recorded/actions/callVest.yml @@ -1,8 +1,9 @@ -spokenForm: call vest languageId: typescript command: - actionName: callAsFunction - partialTargets: + version: 1 + spokenForm: call vest + action: callAsFunction + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive @@ -11,7 +12,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml b/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml index 0233e03694..527728e226 100644 --- a/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml +++ b/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml @@ -1,13 +1,13 @@ -spokenForm: call vest on cap languageId: typescript command: - actionName: callAsFunction - partialTargets: + version: 1 + spokenForm: call vest on cap + action: callAsFunction + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/carveVest.yml b/src/test/suite/fixtures/recorded/actions/carveVest.yml index d94dbe8846..0543ee2ae3 100644 --- a/src/test/suite/fixtures/recorded/actions/carveVest.yml +++ b/src/test/suite/fixtures/recorded/actions/carveVest.yml @@ -1,11 +1,11 @@ -spokenForm: carve vest languageId: typescript command: - actionName: cutToClipboard - partialTargets: + version: 1 + spokenForm: carve vest + action: cutToClipboard + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/chuckVest.yml b/src/test/suite/fixtures/recorded/actions/chuckVest.yml index 8725734116..86472f0f65 100644 --- a/src/test/suite/fixtures/recorded/actions/chuckVest.yml +++ b/src/test/suite/fixtures/recorded/actions/chuckVest.yml @@ -1,11 +1,11 @@ -spokenForm: chuck vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck vest + action: remove + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/clearVest.yml b/src/test/suite/fixtures/recorded/actions/clearVest.yml index 1391da55c6..639b485629 100644 --- a/src/test/suite/fixtures/recorded/actions/clearVest.yml +++ b/src/test/suite/fixtures/recorded/actions/clearVest.yml @@ -1,11 +1,11 @@ -spokenForm: clear vest languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear vest + action: clearAndSetSelection + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/commentVest.yml b/src/test/suite/fixtures/recorded/actions/commentVest.yml index 624d5cbca5..e4a439691f 100644 --- a/src/test/suite/fixtures/recorded/actions/commentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/commentVest.yml @@ -1,11 +1,11 @@ -spokenForm: comment vest languageId: typescript command: - actionName: toggleLineComment - partialTargets: + version: 1 + spokenForm: comment vest + action: toggleLineComment + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/copyVest.yml b/src/test/suite/fixtures/recorded/actions/copyVest.yml index d739bd99a6..6f0ae452bb 100644 --- a/src/test/suite/fixtures/recorded/actions/copyVest.yml +++ b/src/test/suite/fixtures/recorded/actions/copyVest.yml @@ -1,11 +1,11 @@ -spokenForm: copy vest languageId: typescript command: - actionName: copyToClipboard - partialTargets: + version: 1 + spokenForm: copy vest + action: copyToClipboard + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/dedentVest.yml b/src/test/suite/fixtures/recorded/actions/dedentVest.yml index b6e7db9c23..d1c2079faf 100644 --- a/src/test/suite/fixtures/recorded/actions/dedentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dedentVest.yml @@ -1,11 +1,11 @@ -spokenForm: dedent vest languageId: typescript command: - actionName: outdentLine - partialTargets: + version: 1 + spokenForm: dedent vest + action: outdentLine + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: |2 diff --git a/src/test/suite/fixtures/recorded/actions/drinkVest.yml b/src/test/suite/fixtures/recorded/actions/drinkVest.yml index c695de294d..a1beca3ae8 100644 --- a/src/test/suite/fixtures/recorded/actions/drinkVest.yml +++ b/src/test/suite/fixtures/recorded/actions/drinkVest.yml @@ -1,11 +1,11 @@ -spokenForm: drink vest languageId: typescript command: - actionName: editNewLineBefore - partialTargets: + version: 1 + spokenForm: drink vest + action: editNewLineBefore + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/dropVest.yml b/src/test/suite/fixtures/recorded/actions/dropVest.yml index 86b3d69d31..4b526729e5 100644 --- a/src/test/suite/fixtures/recorded/actions/dropVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dropVest.yml @@ -1,11 +1,11 @@ -spokenForm: drop vest languageId: typescript command: - actionName: insertEmptyLineBefore - partialTargets: + version: 1 + spokenForm: drop vest + action: insertEmptyLineBefore + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml b/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml index 1247ce2f71..98ca47a82f 100644 --- a/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml @@ -1,11 +1,11 @@ -spokenForm: dupe up vest languageId: typescript command: - actionName: insertCopyBefore - partialTargets: + version: 1 + spokenForm: dupe up vest + action: insertCopyBefore + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/dupeVest.yml b/src/test/suite/fixtures/recorded/actions/dupeVest.yml index 70707dcbaf..b3cd0c2a37 100644 --- a/src/test/suite/fixtures/recorded/actions/dupeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dupeVest.yml @@ -1,11 +1,11 @@ -spokenForm: dupe vest languageId: typescript command: - actionName: insertCopyAfter - partialTargets: + version: 1 + spokenForm: dupe vest + action: insertCopyAfter + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/findVest.yml b/src/test/suite/fixtures/recorded/actions/findVest.yml index 8d8ca3bdf3..6a5444593b 100644 --- a/src/test/suite/fixtures/recorded/actions/findVest.yml +++ b/src/test/suite/fixtures/recorded/actions/findVest.yml @@ -1,8 +1,9 @@ -spokenForm: find vest languageId: typescript command: - actionName: getText - partialTargets: + version: 1 + spokenForm: find vest + action: getText + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} extraArgs: diff --git a/src/test/suite/fixtures/recorded/actions/floatVest.yml b/src/test/suite/fixtures/recorded/actions/floatVest.yml index 7f50b03f22..da3a3beb0b 100644 --- a/src/test/suite/fixtures/recorded/actions/floatVest.yml +++ b/src/test/suite/fixtures/recorded/actions/floatVest.yml @@ -1,11 +1,11 @@ -spokenForm: float vest languageId: typescript command: - actionName: insertEmptyLineAfter - partialTargets: + version: 1 + spokenForm: float vest + action: insertEmptyLineAfter + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml b/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml index 5aa3197513..634a2cfa07 100644 --- a/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml @@ -1,12 +1,12 @@ -spokenForm: give after dot languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give after dot + action: deselect + targets: - type: primitive position: after mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] initialState: documentContents: a b.c selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml b/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml index 8b7964aee6..2f0ae65c72 100644 --- a/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml +++ b/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml @@ -1,15 +1,15 @@ -spokenForm: give air and bang languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give air and bang + action: deselect + targets: - type: list elements: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: '!'} - extraArgs: [] initialState: documentContents: | "a! diff --git a/src/test/suite/fixtures/recorded/actions/giveBat.yml b/src/test/suite/fixtures/recorded/actions/giveBat.yml index 32397e6f61..727f95b72e 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBat.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBat.yml @@ -1,11 +1,11 @@ -spokenForm: give bat languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give bat + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: b} - extraArgs: [] initialState: documentContents: a b c d selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveBat2.yml b/src/test/suite/fixtures/recorded/actions/giveBat2.yml index 92c9f6a3e2..5fe1fb502a 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBat2.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBat2.yml @@ -1,11 +1,11 @@ -spokenForm: give bat languageId: markdown command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give bat + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: b} - extraArgs: [] initialState: documentContents: a b. selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml b/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml index adc946f7cc..2697470d01 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml @@ -1,12 +1,12 @@ -spokenForm: give before dot languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give before dot + action: deselect + targets: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] initialState: documentContents: a b.c selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml b/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml index 0a641e0bbe..05e4e752a9 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml @@ -1,11 +1,11 @@ -spokenForm: give blue quote languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give blue quote + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} - extraArgs: [] initialState: documentContents: | "hello" diff --git a/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml b/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml index a266cfa2b7..7fad4f09e0 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml @@ -1,15 +1,15 @@ -spokenForm: give blue quote and quote languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give blue quote and quote + action: deselect + targets: - type: list elements: - type: primitive mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - extraArgs: [] initialState: documentContents: | "hello" diff --git a/src/test/suite/fixtures/recorded/actions/giveCap.yml b/src/test/suite/fixtures/recorded/actions/giveCap.yml index a3dd49fe22..f537023237 100644 --- a/src/test/suite/fixtures/recorded/actions/giveCap.yml +++ b/src/test/suite/fixtures/recorded/actions/giveCap.yml @@ -1,11 +1,11 @@ -spokenForm: give cap languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give cap + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: a b c d selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveDot.yml b/src/test/suite/fixtures/recorded/actions/giveDot.yml index 781a750ab2..20cc6dde70 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDot.yml @@ -1,11 +1,11 @@ -spokenForm: give dot languageId: markdown command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give dot + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] initialState: documentContents: a b. selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveDot2.yml b/src/test/suite/fixtures/recorded/actions/giveDot2.yml index ab86d920cc..3565a5d868 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDot2.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDot2.yml @@ -1,11 +1,11 @@ -spokenForm: give dot languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give dot + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] initialState: documentContents: a b.c selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveDrum.yml b/src/test/suite/fixtures/recorded/actions/giveDrum.yml index 423f36a96e..3559ec1365 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDrum.yml @@ -1,11 +1,11 @@ -spokenForm: give drum languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give drum + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: d} - extraArgs: [] initialState: documentContents: a b c d selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml b/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml index b0c2db908d..4e64913ce3 100644 --- a/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml +++ b/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml @@ -1,8 +1,9 @@ -spokenForm: give equals past colon languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give equals past colon + action: deselect + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: ':'} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | const values: string = "hello" diff --git a/src/test/suite/fixtures/recorded/actions/giveHarp.yml b/src/test/suite/fixtures/recorded/actions/giveHarp.yml index bd762abe8b..a6c2523b44 100644 --- a/src/test/suite/fixtures/recorded/actions/giveHarp.yml +++ b/src/test/suite/fixtures/recorded/actions/giveHarp.yml @@ -1,11 +1,11 @@ -spokenForm: give harp languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give harp + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: | "hello" diff --git a/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml b/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml index 5ac60b5e1b..571cc2b804 100644 --- a/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml +++ b/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml @@ -1,15 +1,15 @@ -spokenForm: give harp and whale languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give harp and whale + action: deselect + targets: - type: list elements: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: hello world selections: diff --git a/src/test/suite/fixtures/recorded/actions/giveQuote.yml b/src/test/suite/fixtures/recorded/actions/giveQuote.yml index a849d8ea1b..cc63630faf 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuote.yml @@ -1,11 +1,11 @@ -spokenForm: give quote languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give quote + action: deselect + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - extraArgs: [] initialState: documentContents: | "hello" diff --git a/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml b/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml index 3f01618a74..35e0aa6e77 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml @@ -1,15 +1,15 @@ -spokenForm: give quote and air languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give quote and air + action: deselect + targets: - type: list elements: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | "a! diff --git a/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml b/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml index 95eabb62f3..7abfe83c46 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml @@ -1,15 +1,15 @@ -spokenForm: give quote and bang languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give quote and bang + action: deselect + targets: - type: list elements: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: '!'} - extraArgs: [] initialState: documentContents: | "a! diff --git a/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml b/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml index 3a18df2a9f..6bd28bf865 100644 --- a/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml +++ b/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml @@ -1,15 +1,15 @@ -spokenForm: give vest and harp languageId: typescript command: - actionName: deselect - partialTargets: + version: 1 + spokenForm: give vest and harp + action: deselect + targets: - type: list elements: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: | const values: string = "hello" diff --git a/src/test/suite/fixtures/recorded/actions/indentVest.yml b/src/test/suite/fixtures/recorded/actions/indentVest.yml index 1ad5dcf980..b2b80455df 100644 --- a/src/test/suite/fixtures/recorded/actions/indentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/indentVest.yml @@ -1,11 +1,11 @@ -spokenForm: indent vest languageId: typescript command: - actionName: indentLine - partialTargets: + version: 1 + spokenForm: indent vest + action: indentLine + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/moveVest.yml b/src/test/suite/fixtures/recorded/actions/moveVest.yml index 1da2586e1f..fe708209ba 100644 --- a/src/test/suite/fixtures/recorded/actions/moveVest.yml +++ b/src/test/suite/fixtures/recorded/actions/moveVest.yml @@ -1,8 +1,9 @@ -spokenForm: move vest languageId: typescript command: - actionName: moveToTarget - partialTargets: + version: 1 + spokenForm: move vest + action: moveToTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive @@ -11,7 +12,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml b/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml index b2be76f24b..3fc66eeb51 100644 --- a/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml +++ b/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml @@ -1,13 +1,13 @@ -spokenForm: move vest to cap languageId: typescript command: - actionName: moveToTarget - partialTargets: + version: 1 + spokenForm: move vest to cap + action: moveToTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/pasteCap.yml b/src/test/suite/fixtures/recorded/actions/pasteCap.yml index ff9a7c8750..0cfeff6cd9 100644 --- a/src/test/suite/fixtures/recorded/actions/pasteCap.yml +++ b/src/test/suite/fixtures/recorded/actions/pasteCap.yml @@ -1,11 +1,11 @@ -spokenForm: paste cap languageId: typescript command: - actionName: pasteFromClipboard - partialTargets: + version: 1 + spokenForm: paste cap + action: pasteFromClipboard + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/phonesSpy.yml b/src/test/suite/fixtures/recorded/actions/phonesSpy.yml index 639ad4e222..6b89953a49 100644 --- a/src/test/suite/fixtures/recorded/actions/phonesSpy.yml +++ b/src/test/suite/fixtures/recorded/actions/phonesSpy.yml @@ -1,8 +1,9 @@ -spokenForm: phones spy languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: phones spy + action: replace + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: s} extraArgs: diff --git a/src/test/suite/fixtures/recorded/actions/postVest.yml b/src/test/suite/fixtures/recorded/actions/postVest.yml index 1f32d0c31f..1785260b58 100644 --- a/src/test/suite/fixtures/recorded/actions/postVest.yml +++ b/src/test/suite/fixtures/recorded/actions/postVest.yml @@ -1,11 +1,11 @@ -spokenForm: post vest languageId: typescript command: - actionName: setSelectionAfter - partialTargets: + version: 1 + spokenForm: post vest + action: setSelectionAfter + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/pourVest.yml b/src/test/suite/fixtures/recorded/actions/pourVest.yml index 8b309f5d4a..8d7e4594d4 100644 --- a/src/test/suite/fixtures/recorded/actions/pourVest.yml +++ b/src/test/suite/fixtures/recorded/actions/pourVest.yml @@ -1,11 +1,11 @@ -spokenForm: pour vest languageId: typescript command: - actionName: editNewLineAfter - partialTargets: + version: 1 + spokenForm: pour vest + action: editNewLineAfter + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/preeVest.yml b/src/test/suite/fixtures/recorded/actions/preeVest.yml index 7484651753..297df7b822 100644 --- a/src/test/suite/fixtures/recorded/actions/preeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/preeVest.yml @@ -1,11 +1,11 @@ -spokenForm: pree vest languageId: typescript command: - actionName: setSelectionBefore - partialTargets: + version: 1 + spokenForm: pree vest + action: setSelectionBefore + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/puffVest.yml b/src/test/suite/fixtures/recorded/actions/puffVest.yml index efd898b894..b6db2e5e6a 100644 --- a/src/test/suite/fixtures/recorded/actions/puffVest.yml +++ b/src/test/suite/fixtures/recorded/actions/puffVest.yml @@ -1,11 +1,11 @@ -spokenForm: puff vest languageId: typescript command: - actionName: insertEmptyLinesAround - partialTargets: + version: 1 + spokenForm: puff vest + action: insertEmptyLinesAround + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml b/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml index 4a40e0c505..e360e82d1c 100644 --- a/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml +++ b/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml @@ -1,8 +1,9 @@ -spokenForm: reformat harp as snake languageId: typescript command: - actionName: getText - partialTargets: + version: 1 + spokenForm: reformat harp as snake + action: getText + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} extraArgs: diff --git a/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml b/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml index 308cbf513b..fe09cb9c5e 100644 --- a/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml +++ b/src/test/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml @@ -1,8 +1,9 @@ -spokenForm: reformat harp as snake languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: reformat harp as snake + action: replace + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} extraArgs: diff --git a/src/test/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml b/src/test/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml index c1581c5ac8..3af602f4a7 100644 --- a/src/test/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml +++ b/src/test/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml @@ -1,8 +1,9 @@ -spokenForm: replace air and bat and cap with count languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: replace air and bat and cap with count + action: replace + targets: - type: list elements: - type: primitive diff --git a/src/test/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml b/src/test/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml index df496bef1a..559caaa4a8 100644 --- a/src/test/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml +++ b/src/test/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml @@ -1,8 +1,9 @@ -spokenForm: replace vest with whatever languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: replace vest with whatever + action: replace + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} extraArgs: diff --git a/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml b/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml index c72912234b..4a49f2cb56 100644 --- a/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml +++ b/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml @@ -1,8 +1,9 @@ -spokenForm: reverse air and bat and cap languageId: typescript command: - actionName: reverseTargets - partialTargets: + version: 1 + spokenForm: reverse air and bat and cap + action: reverseTargets + targets: - type: list elements: - type: primitive @@ -11,7 +12,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: b} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/roundWrapThis.yml b/src/test/suite/fixtures/recorded/actions/roundWrapThis.yml index 17b3247d4d..412d39cc85 100644 --- a/src/test/suite/fixtures/recorded/actions/roundWrapThis.yml +++ b/src/test/suite/fixtures/recorded/actions/roundWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: round wrap this languageId: typescript command: - actionName: wrapWithPairedDelimiter - partialTargets: + version: 1 + spokenForm: round wrap this + action: wrapWithPairedDelimiter + targets: - type: primitive mark: {type: cursor} extraArgs: [(, )] diff --git a/src/test/suite/fixtures/recorded/actions/roundWrapVest.yml b/src/test/suite/fixtures/recorded/actions/roundWrapVest.yml index b106a694e2..962855a402 100644 --- a/src/test/suite/fixtures/recorded/actions/roundWrapVest.yml +++ b/src/test/suite/fixtures/recorded/actions/roundWrapVest.yml @@ -1,8 +1,9 @@ -spokenForm: round wrap vest languageId: typescript command: - actionName: wrapWithPairedDelimiter - partialTargets: + version: 1 + spokenForm: round wrap vest + action: wrapWithPairedDelimiter + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} extraArgs: [(, )] diff --git a/src/test/suite/fixtures/recorded/actions/roundWrapVest2.yml b/src/test/suite/fixtures/recorded/actions/roundWrapVest2.yml index 65d537ff31..e003ea366b 100644 --- a/src/test/suite/fixtures/recorded/actions/roundWrapVest2.yml +++ b/src/test/suite/fixtures/recorded/actions/roundWrapVest2.yml @@ -1,8 +1,9 @@ -spokenForm: round wrap vest languageId: typescript command: - actionName: wrapWithPairedDelimiter - partialTargets: + version: 1 + spokenForm: round wrap vest + action: wrapWithPairedDelimiter + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} extraArgs: [(, )] diff --git a/src/test/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml b/src/test/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml index 03bb8ebf18..faad9d02e3 100644 --- a/src/test/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml +++ b/src/test/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml @@ -1,8 +1,9 @@ -spokenForm: sort air and cap and bat languageId: typescript command: - actionName: sortTargets - partialTargets: + version: 1 + spokenForm: sort air and cap and bat + action: sortTargets + targets: - type: list elements: - type: primitive @@ -11,7 +12,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: c} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: b} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml b/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml index 187ffc7409..8ebdf1eaee 100644 --- a/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml +++ b/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml @@ -1,13 +1,13 @@ -spokenForm: swap vest with cap languageId: typescript command: - actionName: swapTargets - partialTargets: + version: 1 + spokenForm: swap vest with cap + action: swapTargets + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/swapWithVest.yml b/src/test/suite/fixtures/recorded/actions/swapWithVest.yml index 1f5d5e6eea..4aad913b81 100644 --- a/src/test/suite/fixtures/recorded/actions/swapWithVest.yml +++ b/src/test/suite/fixtures/recorded/actions/swapWithVest.yml @@ -1,12 +1,12 @@ -spokenForm: swap with vest languageId: typescript command: - actionName: swapTargets - partialTargets: + version: 1 + spokenForm: swap with vest + action: swapTargets + targets: - {type: primitive} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/takeVest.yml b/src/test/suite/fixtures/recorded/actions/takeVest.yml index 4d71b42952..8b9bd0c4b2 100644 --- a/src/test/suite/fixtures/recorded/actions/takeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/takeVest.yml @@ -1,11 +1,11 @@ -spokenForm: take vest languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take vest + action: setSelection + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml index 2eb64d51e0..553c2b9f2b 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml @@ -1,8 +1,9 @@ -spokenForm: take cap and vest and harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take cap and vest and harp + action: setSelection + targets: - type: list elements: - type: primitive @@ -11,7 +12,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml index ca3f7bfe6d..3481507a0c 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml @@ -1,8 +1,9 @@ -spokenForm: take cap past harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take cap past harp + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: h} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml index b12a277f53..7618b29400 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml @@ -1,8 +1,9 @@ -spokenForm: take harp and vest and cap languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take harp and vest and cap + action: setSelection + targets: - type: list elements: - type: primitive @@ -11,7 +12,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml index e5a7db1b42..947180ec4c 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml @@ -1,8 +1,9 @@ -spokenForm: take harp past cap languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take harp past cap + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: c} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml index d36cec1872..6782ffba97 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml @@ -1,8 +1,9 @@ -spokenForm: take line vest and air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take line vest and air + action: setSelection + targets: - type: list elements: - type: primitive @@ -10,7 +11,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: " value = {a:2}" selections: diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml b/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml index 62b0a503f1..bba6b0076b 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml @@ -1,14 +1,14 @@ -spokenForm: take past end of token languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take past end of token + action: setSelection + targets: - type: range start: {type: primitive} end: {type: primitive, position: after, insideOutsideType: inside, selectionType: token} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml b/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml index 8589e57cd0..df023a9e28 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml @@ -1,14 +1,14 @@ -spokenForm: take past start of token languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take past start of token + action: setSelection + targets: - type: range start: {type: primitive} end: {type: primitive, position: before, insideOutsideType: inside, selectionType: token} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml index 69d8f23455..0417f55013 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml @@ -1,8 +1,9 @@ -spokenForm: take past trap languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take past trap + action: setSelection + targets: - type: range start: {type: primitive} end: @@ -10,7 +11,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: t} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml index 7e52560132..6821a56158 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml @@ -1,8 +1,9 @@ -spokenForm: take token past trap languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take token past trap + action: setSelection + targets: - type: range start: {type: primitive, selectionType: token} end: @@ -10,7 +11,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: t} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml index a2d74dc533..1560b1352d 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml @@ -1,8 +1,9 @@ -spokenForm: take vest tween whale languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take vest tween whale + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: w} excludeStart: true excludeEnd: true - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml index 841d68fd59..efe1009b9b 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml @@ -1,8 +1,9 @@ -spokenForm: take vest until whale languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take vest until whale + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: w} excludeStart: false excludeEnd: true - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml index 16a5792d6f..1ea8db06b6 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml @@ -1,8 +1,9 @@ -spokenForm: take whale tween vest languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take whale tween vest + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: v} excludeStart: true excludeEnd: true - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml index ded501aa59..45583043e7 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml @@ -1,8 +1,9 @@ -spokenForm: take whale until vest languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take whale until vest + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: v} excludeStart: false excludeEnd: true - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringAirToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml similarity index 93% rename from src/test/suite/fixtures/recorded/navigationMap/bringAirToThirdCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml index 937bd26405..2e6dc406eb 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringAirToThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring air to third car whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air to third car whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringCommaToEndOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml index c48fc74c3c..5d332258e9 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToEndOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml @@ -1,15 +1,15 @@ -spokenForm: bring comma to end of point take point languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring comma to end of point take point + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: ','} - type: primitive position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringCommaToStartOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml index eca69672ca..63595f3e82 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToStartOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml @@ -1,15 +1,15 @@ -spokenForm: bring comma to start of point take point languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring comma to start of point take point + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: ','} - type: primitive position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAfterWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpAfterWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml index abbfd69cc1..30dc8f8444 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAfterWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml @@ -1,14 +1,14 @@ -spokenForm: bring harp after whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp after whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} position: after - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml index 8f37bffdf4..47adf5fb01 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring harp and point to end of this and end of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp and point to end of this and end of whale take whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -19,7 +20,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml index d49098c787..deee28f351 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring harp and point to this and start of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp and point to this and start of whale take whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -17,7 +18,6 @@ command: position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpBeforeWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpBeforeWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml index 6bce8c707f..455efe3062 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpBeforeWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml @@ -1,14 +1,14 @@ -spokenForm: bring harp before whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp before whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} position: before - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml similarity index 93% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml index 194c9e8863..9aca0390d2 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring harp take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive @@ -11,7 +12,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpToEndOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml index 8271800bdc..ab28df027b 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToEndOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml @@ -1,15 +1,15 @@ -spokenForm: bring harp to end of point take point languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to end of point take point + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml index 2484d054e2..678dac4669 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml @@ -1,15 +1,15 @@ -spokenForm: bring harp to start of point take point languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to start of point take point + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml index fc74728dbe..6c31393f78 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring harp to start of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to start of whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAfterFirstCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml similarity index 93% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAfterFirstCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml index c91dc9cc19..a800665a71 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAfterFirstCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring point after first car whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point after first car whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: .} - type: primitive @@ -10,7 +11,6 @@ command: modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} position: after - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml index b7cdefaaec..f31659fb46 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring point and harp to end of second car whale and end of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point and harp to end of second car whale and end of whale take whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -21,7 +22,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml similarity index 95% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml index 07481657de..784ab6dbb6 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring point and harp to end of this and end of whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point and harp to end of this and end of whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -19,7 +20,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml index 097d18db61..a572792994 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring point and harp to end of this and end of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point and harp to end of this and end of whale take whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -19,7 +20,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml index 86c0c32271..c800f11648 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml @@ -1,10 +1,11 @@ -spokenForm: >- - bring point and harp to start of second car whale and start of whale take - whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: >- + bring point and harp to start of second car whale and start of whale take + whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -23,7 +24,6 @@ command: position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml index 1fc693d2ef..fd08052d86 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring point and harp to this and start of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point and harp to this and start of whale take whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -17,7 +18,6 @@ command: position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml index 474e355a75..ab7bc37076 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring point and point to end of second car whale and end of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point and point to end of second car whale and end of whale take whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -21,7 +22,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml similarity index 93% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml index b9817d01c9..9e6aa159a5 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml @@ -1,10 +1,11 @@ -spokenForm: >- - bring point and point to start of second car whale and start of whale take - whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: >- + bring point and point to start of second car whale and start of whale take + whale + action: replaceWithTarget + targets: - type: list elements: - type: primitive @@ -23,7 +24,6 @@ command: position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointToEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml index d488b6f9c2..b24e9fdfa7 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointToEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring point to end of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point to end of whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: .} - type: primitive position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml similarity index 92% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointToStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml index 7bfc932e76..b30e138d29 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointToStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring point to start of whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point to start of whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: .} - type: primitive position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml similarity index 93% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointToThirdCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml index 23a0c5c3ee..9128e9e277 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/bringPointToThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring point to third car whale take whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring point to third car whale take whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: .} - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckFirstTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml similarity index 90% rename from src/test/suite/fixtures/recorded/navigationMap/chuckFirstTwoCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml index 3737d8dffc..590102154e 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/chuckFirstTwoCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml @@ -1,13 +1,13 @@ -spokenForm: chuck first two car whale take whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck first two car whale take whale + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello world diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml index 9e79b55e4c..47648981fc 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: chuck fourth car whale past third car air take whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck fourth car whale past third car air take whale + action: remove + targets: - type: range start: type: primitive @@ -16,7 +17,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckHarpPastAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/chuckHarpPastAirTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml index a57c75a739..112f11b646 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/chuckHarpPastAirTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: chuck harp past air take whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck harp past air take whale + action: remove + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckLastTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml similarity index 91% rename from src/test/suite/fixtures/recorded/navigationMap/chuckLastTwoCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml index 63e6219c12..1a1b6b8a69 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/chuckLastTwoCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml @@ -1,13 +1,13 @@ -spokenForm: chuck last two car whale take whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck last two car whale take whale + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: -2, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckSecondPastThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml similarity index 91% rename from src/test/suite/fixtures/recorded/navigationMap/chuckSecondPastThirdCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml index 5111678d47..428b427208 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/chuckSecondPastThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml @@ -1,13 +1,13 @@ -spokenForm: chuck second past third car whale take whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck second past third car whale take whale + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 1, active: 2, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello. world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml index a9e6f8a4c6..4ce21734da 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: chuck third car harp past second car whale take whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck third car harp past second car whale take whale + action: remove + targets: - type: range start: type: primitive @@ -16,7 +17,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: w} excludeStart: false excludeEnd: false - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello world whatever diff --git a/src/test/suite/fixtures/recorded/navigationMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml similarity index 94% rename from src/test/suite/fixtures/recorded/navigationMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml index e3ab2821c6..213464506d 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -spokenForm: move fourth car harp past second car whale to end of whale take whale languageId: plaintext command: - actionName: moveToTarget - partialTargets: + version: 1 + spokenForm: move fourth car harp past second car whale to end of whale take whale + action: moveToTarget + targets: - type: range start: type: primitive @@ -20,7 +21,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] marksToCheck: [default.w] initialState: documentContents: hello world whatever diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml b/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml new file mode 100644 index 0000000000..fe5a4660b2 --- /dev/null +++ b/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml @@ -0,0 +1,26 @@ +languageId: plaintext +command: + version: 1 + spokenForm: take harp + action: setSelection + targets: + - type: primitive + mark: {type: decoratedSymbol, symbolColor: default, character: h} +initialState: + documentContents: hello world + selections: + - anchor: {line: 0, character: 11} + active: {line: 0, character: 11} + marks: + default.h: + start: {line: 0, character: 0} + end: {line: 0, character: 5} +finalState: + documentContents: hello world + selections: + - anchor: {line: 0, character: 0} + active: {line: 0, character: 5} + thatMark: + - anchor: {line: 0, character: 0} + active: {line: 0, character: 5} +fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}] diff --git a/src/test/suite/fixtures/recorded/headTail/takeHead.yml b/src/test/suite/fixtures/recorded/headTail/takeHead.yml index 457acac3d7..bb79b235da 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeHead.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeHead.yml @@ -1,11 +1,11 @@ -spokenForm: take head languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take head + action: setSelection + targets: - type: primitive modifier: {type: head} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml b/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml index 7fd58366e4..9ba4107233 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml @@ -1,12 +1,12 @@ -spokenForm: take head vest languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take head vest + action: setSelection + targets: - type: primitive modifier: {type: head} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/headTail/takeTail.yml b/src/test/suite/fixtures/recorded/headTail/takeTail.yml index 53af0023cd..fe6fee9190 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeTail.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeTail.yml @@ -1,11 +1,11 @@ -spokenForm: take tail languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take tail + action: setSelection + targets: - type: primitive modifier: {type: tail} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml b/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml index 74acea8d1d..7e188370ab 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml @@ -1,12 +1,12 @@ -spokenForm: take tail vest languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take tail vest + action: setSelection + targets: - type: primitive modifier: {type: tail} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml b/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml index 141dfe762b..872ae67610 100644 --- a/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml +++ b/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml @@ -1,8 +1,9 @@ -spokenForm: bring line bat past end of funk to this languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring line bat past end of funk to this + action: replaceWithTarget + targets: - type: range start: type: primitive @@ -17,7 +18,6 @@ command: excludeEnd: false - type: primitive mark: {type: cursor} - extraArgs: [] initialState: documentContents: | function foo() { diff --git a/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml b/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml index c9811b41e9..d8f2840e1f 100644 --- a/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml +++ b/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml @@ -1,15 +1,15 @@ -spokenForm: bring map air to line harp languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring map air to line harp + action: replaceWithTarget + targets: - type: primitive modifier: {type: containingScope, scopeType: map, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: primitive selectionType: line mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |2- hello world diff --git a/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml b/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml index 69c2b584f8..a1a89d2f7e 100644 --- a/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml +++ b/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml @@ -1,15 +1,15 @@ -spokenForm: bring map air to token harp languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring map air to token harp + action: replaceWithTarget + targets: - type: primitive modifier: {type: containingScope, scopeType: map, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: primitive selectionType: token mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |2- hello diff --git a/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml b/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml index 12f119dedd..96be9527ea 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml @@ -1,12 +1,12 @@ -spokenForm: bring odd to line languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring odd to line + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: o} - {type: primitive, selectionType: line} - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/bringOddToState.yml b/src/test/suite/fixtures/recorded/inference/bringOddToState.yml index dd7fb6f415..27c82ea167 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToState.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToState.yml @@ -1,13 +1,13 @@ -spokenForm: bring odd to state languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring odd to state + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: o} - type: primitive modifier: {type: containingScope, scopeType: statement, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml b/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml index 0894cee13a..6ff184be22 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml @@ -1,12 +1,12 @@ -spokenForm: bring odd to token languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring odd to token + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: o} - {type: primitive, selectionType: token} - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml b/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml index 4a782e5cf9..8022765b75 100644 --- a/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml +++ b/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml @@ -1,15 +1,15 @@ -spokenForm: bring token harp to map air languageId: typescript command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring token harp to map air + action: replaceWithTarget + targets: - type: primitive selectionType: token mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive modifier: {type: containingScope, scopeType: map, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: |2- hello diff --git a/src/test/suite/fixtures/recorded/inference/ifWrapTokenFine.yml b/src/test/suite/fixtures/recorded/inference/ifWrapTokenFine.yml index 1fa522c32b..6703bcfc36 100644 --- a/src/test/suite/fixtures/recorded/inference/ifWrapTokenFine.yml +++ b/src/test/suite/fixtures/recorded/inference/ifWrapTokenFine.yml @@ -1,8 +1,9 @@ -spokenForm: if wrap token fine languageId: typescript command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if wrap token fine + action: wrapWithSnippet + targets: - type: primitive selectionType: token mark: {type: decoratedSymbol, symbolColor: default, character: f} diff --git a/src/test/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml index 6d4bdf40b2..e2fad04ab8 100644 --- a/src/test/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml @@ -1,8 +1,9 @@ -spokenForm: take after vest past air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take after vest past air + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml index 07c2a52d1b..c3ceea94ae 100644 --- a/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml @@ -1,8 +1,9 @@ -spokenForm: take after vest past before air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take after vest past before air + action: setSelection + targets: - type: range start: type: primitive @@ -14,7 +15,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml b/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml index 86726beb05..6e5f49c16c 100644 --- a/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml +++ b/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml @@ -1,8 +1,9 @@ -spokenForm: take air past end of line languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take air past end of line + action: setSelection + targets: - type: range start: type: primitive @@ -10,7 +11,6 @@ command: end: {type: primitive, position: after, insideOutsideType: inside, selectionType: line} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml b/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml index 29700ca4b5..c59e4e8c65 100644 --- a/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml +++ b/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml @@ -1,8 +1,9 @@ -spokenForm: take each past start of line languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take each past start of line + action: setSelection + targets: - type: range start: type: primitive @@ -10,7 +11,6 @@ command: end: {type: primitive, position: before, insideOutsideType: inside, selectionType: line} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml b/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml index 89b0834b95..adf7d5938f 100644 --- a/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml +++ b/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml @@ -1,12 +1,12 @@ -spokenForm: take first word languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first word + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml b/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml index 2006165640..cafe966529 100644 --- a/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml @@ -1,8 +1,9 @@ -spokenForm: take harp and string each languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take harp and string each + action: setSelection + targets: - type: list elements: - type: primitive @@ -10,7 +11,6 @@ command: - type: primitive modifier: {type: containingScope, scopeType: string} mark: {type: decoratedSymbol, symbolColor: default, character: e} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml b/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml index 44208159f7..b29f093310 100644 --- a/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml @@ -1,8 +1,9 @@ -spokenForm: take harp past string each languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take harp past string each + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: e} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeLastChar.yml b/src/test/suite/fixtures/recorded/inference/takeLastChar.yml index eaebcbc932..3fe4792521 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLastChar.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLastChar.yml @@ -1,12 +1,12 @@ -spokenForm: take last char languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take last char + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml b/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml index 240f95ef94..e125c2e9ce 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml @@ -1,8 +1,9 @@ -spokenForm: take line past air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take line past air + action: setSelection + targets: - type: range start: {type: primitive, selectionType: line} end: @@ -10,7 +11,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml b/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml index aa2e3481a2..5465682771 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml @@ -1,8 +1,9 @@ -spokenForm: take line vest and air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take line vest and air + action: setSelection + targets: - type: list elements: - type: primitive @@ -10,7 +11,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: v} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml b/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml index 186b7be1c0..ac5fe6552f 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml @@ -1,8 +1,9 @@ -spokenForm: take line vest past air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take line vest past air + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml index 69f32a1f77..0d0fcbf0ea 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml @@ -1,8 +1,9 @@ -spokenForm: take odd past end of state languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take odd past end of state + action: setSelection + targets: - type: range start: type: primitive @@ -14,7 +15,6 @@ command: modifier: {type: containingScope, scopeType: statement, includeSiblings: false} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml index 42597b3782..ddc3d77c9f 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml @@ -1,8 +1,9 @@ -spokenForm: take odd past line languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take odd past line + action: setSelection + targets: - type: range start: type: primitive @@ -10,7 +11,6 @@ command: end: {type: primitive, selectionType: line} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml index 8462c640e7..bbaad354ac 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml @@ -1,8 +1,9 @@ -spokenForm: take odd past state languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take odd past state + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: modifier: {type: containingScope, scopeType: statement, includeSiblings: false} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml index db0f8f792f..59abd6b2a9 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml @@ -1,8 +1,9 @@ -spokenForm: take odd past token languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take odd past token + action: setSelection + targets: - type: range start: type: primitive @@ -10,7 +11,6 @@ command: end: {type: primitive, selectionType: token} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: |- const foo = "hello"; diff --git a/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml b/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml index 5569239d09..40f6bb800b 100644 --- a/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml @@ -1,8 +1,9 @@ -spokenForm: take past line air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take past line air + action: setSelection + targets: - type: range start: {type: primitive} end: @@ -11,7 +12,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml b/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml index ce714ce670..73fe368199 100644 --- a/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml @@ -1,8 +1,9 @@ -spokenForm: take string harp and each languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take string harp and each + action: setSelection + targets: - type: list elements: - type: primitive @@ -10,7 +11,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: e} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml b/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml index 72171695b6..2272e7f2c4 100644 --- a/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml @@ -1,8 +1,9 @@ -spokenForm: take string harp past each languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take string harp past each + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: e} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml index 8486331e3a..f3be7250d7 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml @@ -1,8 +1,9 @@ -spokenForm: take vest and line air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take vest and line air + action: setSelection + targets: - type: list elements: - type: primitive @@ -10,7 +11,6 @@ command: - type: primitive selectionType: line mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml index d3d43e329d..8fcfd71f9d 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml @@ -1,8 +1,9 @@ -spokenForm: take vest past after air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take vest past after air + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml index 534abedac8..5efeab04bc 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml @@ -1,8 +1,9 @@ -spokenForm: take vest past before air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take vest past before air + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml index c167726b0b..a9c45a73ac 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml @@ -1,8 +1,9 @@ -spokenForm: take vest past line air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take vest past line air + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml b/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml index df80e9ecaf..77b25fb2af 100644 --- a/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml @@ -1,11 +1,11 @@ -spokenForm: clear funk languageId: c command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear funk + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: |- int f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml index 5a850aa113..c4d1cee0c4 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type air languageId: cpp command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type air + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: string name = "hello"; selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml index 9115afc69a..3786a4bfd3 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type soon languageId: cpp command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type soon + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: s} - extraArgs: [] initialState: documentContents: |- void myFunk(string value) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml index 6899773833..0f5cf1cf3a 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: else state wrap this languageId: cpp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: else state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.alternative] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml b/src/test/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml index c200bba920..77f45a48ae 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if else wrap this languageId: cpp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if else wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml index 980a579a7e..0b7b3b2f71 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if state wrap this languageId: cpp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml index ad1a02d0f2..5d4f7a25e7 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: |- int main() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml index 9da517b735..bf44ce5fef 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: |- int f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml index 879915f1b1..9a7257a9ab 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml @@ -1,11 +1,11 @@ -spokenForm: take attribute languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take attribute + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: attribute} - extraArgs: [] initialState: documentContents: | [[nodiscard]] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml index eadecca6df..34421062b0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml @@ -1,11 +1,11 @@ -spokenForm: take call languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take call + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionCall} - extraArgs: [] initialState: documentContents: |- int f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml index 1b273fa54c..8a35e194dc 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml @@ -1,11 +1,11 @@ -spokenForm: take class languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: class} - extraArgs: [] initialState: documentContents: class A { int a; }; selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml index 29b2f593ff..5718336335 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml @@ -1,11 +1,11 @@ -spokenForm: take class languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: class} - extraArgs: [] initialState: documentContents: enum class A { B }; selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml index 51fd70b055..6a8ffaafdc 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml @@ -1,11 +1,11 @@ -spokenForm: take class name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: className} - extraArgs: [] initialState: documentContents: class A { int a; }; selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml index c1ddfd3d3f..23de3e8ebe 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml @@ -1,11 +1,11 @@ -spokenForm: take class name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: className} - extraArgs: [] initialState: documentContents: enum class A { B }; selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml index 054ec779cf..26a142f736 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml @@ -1,11 +1,11 @@ -spokenForm: take class name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: className} - extraArgs: [] initialState: documentContents: void ClassName::method() {} selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml index b42c13105f..8465701ef1 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml @@ -1,11 +1,11 @@ -spokenForm: take comment languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take comment + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: comment} - extraArgs: [] initialState: documentContents: int a; // the comment selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml index 70fc48e3e9..12729ba3ad 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml @@ -1,11 +1,11 @@ -spokenForm: take every arg languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} - extraArgs: [] initialState: documentContents: |- int f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml index cc91645dc8..998916b972 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: |- int f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml index 3efc42de51..d78c281424 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: |- int f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml index 122c9c8dd9..b87cc4c703 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: int f(int a, int b); selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml index 4842280ed9..330ba9321a 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: |- int f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml index f2327971d2..1f934433cb 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: |- int C::f(int a, int b) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml index 0f0a065c17..ac10cad068 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: int f(int a, int b); selections: diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml index 84ffbf7780..be7c6b1fb3 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml @@ -1,11 +1,11 @@ -spokenForm: take if languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take if + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: ifStatement} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml index a90cd67dad..4a7008a58a 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml @@ -1,11 +1,11 @@ -spokenForm: take if languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take if + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: ifStatement} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml index 5a1a892125..93fd92e8ed 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml index 212cf9c90a..654fb3bbd4 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml index 41beb7a690..bfb335af0e 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml @@ -1,11 +1,11 @@ -spokenForm: take lambda languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take lambda + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction} - extraArgs: [] initialState: documentContents: | void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml index db9cdf6164..a1d3403c58 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml index b8eb8f047d..8c2f702141 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml index d8f9c016be..7228e0dde0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml index a68c008027..2d6fbc3341 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: |- void f(int i = 1) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml index 627e1d603c..31a382d5b0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: |- void f(int i = 1) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml index 2bcb3254bf..97c77b2ee8 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml @@ -1,11 +1,11 @@ -spokenForm: take state languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take state + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: statement} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml index 9a90c967fa..49cc40f896 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml @@ -1,11 +1,11 @@ -spokenForm: take state languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take state + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: statement} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml index 80108f8b52..e1d54b5226 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml @@ -1,11 +1,11 @@ -spokenForm: take state languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take state + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: statement} - extraArgs: [] initialState: documentContents: |- void f() { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml index b65f377445..3ad6207626 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml @@ -1,11 +1,11 @@ -spokenForm: take string languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take string + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: string} - extraArgs: [] initialState: documentContents: | char* a = "hello world"; diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml index 12995db166..50511ab9dd 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | int f(int a) {} diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml index b9b5891847..2d3467da82 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | int f(int a) {} diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml index 5a09b52d0a..635e152670 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | int f(int a) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml index 8e2ad63eca..457bddea59 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | int f(int a) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml index e3f37d0553..13acfb009e 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | int f(int a) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml index 5dafc6716d..39e570fb38 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: cpp command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | int f(int a = 1) { diff --git a/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml b/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml index 30db9c896e..55697122fe 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: cpp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml b/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml index 76f0437ba9..e57b6bbc51 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: cpp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml index 2b8072019b..1ccce27179 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type soon languageId: csharp command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type soon + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: s} - extraArgs: [] initialState: documentContents: String name = "hello"; selections: diff --git a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml index 614929dd17..450bcf8344 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type soon languageId: csharp command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type soon + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: s} - extraArgs: [] initialState: documentContents: |- void myFunk(String value) { diff --git a/src/test/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml index 793a3280f9..1e1424e4d8 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: else state wrap this languageId: csharp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: else state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.alternative] diff --git a/src/test/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml b/src/test/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml index 74aa1f9a97..5d72bbd951 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if else wrap this languageId: csharp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if else wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml index a512adf837..49e4d20cba 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if state wrap this languageId: csharp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml b/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml index bd5dcdcae5..842c94ccf1 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: csharp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml b/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml index 52c142ca02..1ae3e4abbe 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: csharp command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml b/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml index 599bdd22e8..6501816cea 100644 --- a/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml +++ b/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type near languageId: java command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type near + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: 'n'} - extraArgs: [] initialState: documentContents: |- public class Java { diff --git a/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml b/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml index b205764a11..62d66a373e 100644 --- a/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml +++ b/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type urge languageId: java command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type urge + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: u} - extraArgs: [] initialState: documentContents: |- public class Java { diff --git a/src/test/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml index 65f0f5a163..5b8cf1b001 100644 --- a/src/test/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: else state wrap this languageId: java command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: else state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.alternative] diff --git a/src/test/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml b/src/test/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml index ec76cb7d1b..b387d9787f 100644 --- a/src/test/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if else wrap this languageId: java command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if else wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml index a0d48ccb44..383c862930 100644 --- a/src/test/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if state wrap this languageId: java command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeArg.yml b/src/test/suite/fixtures/recorded/languages/java/takeArg.yml index 54cc8e9e6d..ed5d87771b 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeArg.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml index 063bf41a91..b57242acaf 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCall.yml b/src/test/suite/fixtures/recorded/languages/java/takeCall.yml index eba38f5fd1..469dd20f6d 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCall.yml @@ -1,11 +1,11 @@ -spokenForm: take call languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take call + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionCall} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeClass.yml b/src/test/suite/fixtures/recorded/languages/java/takeClass.yml index 7458eb8014..1c31349b1e 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeClass.yml @@ -1,11 +1,11 @@ -spokenForm: take class languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: class} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml index a666f37446..3e1b78c775 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml @@ -1,11 +1,11 @@ -spokenForm: take class name languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: className} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeComment.yml b/src/test/suite/fixtures/recorded/languages/java/takeComment.yml index 1dc6256429..dc99db2903 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeComment.yml @@ -1,11 +1,11 @@ -spokenForm: take comment languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take comment + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: comment} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml b/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml index 14ca6d2040..67fef48846 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- public class MyClass { diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml b/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml index 15fabb6639..aa14f412d3 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- public class MyClass { diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml b/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml index 835a5e75c5..6ec2874ef6 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- public class MyClass { diff --git a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml index 299bd302d1..b24537334f 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml @@ -1,11 +1,11 @@ -spokenForm: take every arg languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml index aeeee7fd73..9974d5688c 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml @@ -1,11 +1,11 @@ -spokenForm: take every arg languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml index 98d478c843..db670eefbf 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml index d48016cccc..1a3d8e3ab9 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml index 98d5d1dc94..c5c60983ab 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml index ccba428c14..2d41869611 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml index 7236d52a54..62eb840055 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeIf.yml b/src/test/suite/fixtures/recorded/languages/java/takeIf.yml index 7b9f7c7e91..850e45c323 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeIf.yml @@ -1,11 +1,11 @@ -spokenForm: take if languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take if + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: ifStatement} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeItem.yml b/src/test/suite/fixtures/recorded/languages/java/takeItem.yml index 2763cf7601..44cd7f9353 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeItem.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeList.yml b/src/test/suite/fixtures/recorded/languages/java/takeList.yml index 380dfd5f26..746865f1ef 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeList.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeMap.yml b/src/test/suite/fixtures/recorded/languages/java/takeMap.yml index 25866c448c..0c6617783e 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeMap.yml @@ -1,11 +1,11 @@ -spokenForm: take map languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take map + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: map} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeName.yml b/src/test/suite/fixtures/recorded/languages/java/takeName.yml index b1287f95f3..2ed15fc67a 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeName2.yml b/src/test/suite/fixtures/recorded/languages/java/takeName2.yml index a478a5450a..97bf322871 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName2.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeName3.yml b/src/test/suite/fixtures/recorded/languages/java/takeName3.yml index 2a540a22bb..c553c8ba89 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName3.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeState.yml b/src/test/suite/fixtures/recorded/languages/java/takeState.yml index b4cbbd7c58..5d1ba65e51 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeState.yml @@ -1,11 +1,11 @@ -spokenForm: take state languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take state + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: statement} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeString.yml b/src/test/suite/fixtures/recorded/languages/java/takeString.yml index 5b2a00de1b..3e3a346cf5 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeString.yml @@ -1,11 +1,11 @@ -spokenForm: take string languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take string + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: string} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeType.yml b/src/test/suite/fixtures/recorded/languages/java/takeType.yml index ed47abc4da..34dfccd974 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeType2.yml b/src/test/suite/fixtures/recorded/languages/java/takeType2.yml index 5211288e31..a2c427fc9c 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType2.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeType3.yml b/src/test/suite/fixtures/recorded/languages/java/takeType3.yml index 91c7ecb8b2..be9c5ace80 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType3.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/takeValue.yml b/src/test/suite/fixtures/recorded/languages/java/takeValue.yml index 129de8a49b..e0b32996c3 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeValue.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: java command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml b/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml index 553cc672f9..b5e199ba32 100644 --- a/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: java command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml b/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml index 97f052458f..9b4afb18ea 100644 --- a/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: java command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/json/takeItem.yml b/src/test/suite/fixtures/recorded/languages/json/takeItem.yml index b1f4c193e3..8b5b7633db 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeItem.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: json command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml index e596c35431..4dea39a194 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: json command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/json/takeKey.yml b/src/test/suite/fixtures/recorded/languages/json/takeKey.yml index e1f7d706e9..6ccd9b9dd6 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeKey.yml @@ -1,11 +1,11 @@ -spokenForm: take key languageId: json command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take key + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/json/takeList.yml b/src/test/suite/fixtures/recorded/languages/json/takeList.yml index d52adb14f1..4df3f4ca47 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeList.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: json command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/json/takeString.yml b/src/test/suite/fixtures/recorded/languages/json/takeString.yml index 8ad0f1ebb1..aac2c213ca 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeString.yml @@ -1,11 +1,11 @@ -spokenForm: take string languageId: json command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take string + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: string} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/json/takeValue.yml b/src/test/suite/fixtures/recorded/languages/json/takeValue.yml index 2d097f6b5c..20e692db54 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeValue.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: json command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml index 64eb61580a..c4d5eeeec9 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml @@ -1,11 +1,11 @@ -spokenForm: take attribute languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take attribute + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: attribute} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml index c34cfc1b81..982626ccf5 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml @@ -1,11 +1,11 @@ -spokenForm: take element languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take element + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: xmlElement} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml index fd232a4141..49cc6c24ce 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml @@ -1,11 +1,11 @@ -spokenForm: take end tag languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take end tag + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: xmlEndTag} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml index f3f73ea218..8905d32546 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml @@ -1,11 +1,11 @@ -spokenForm: take every attribute languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every attribute + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: attribute, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml index f20ea9978e..e5bb2e8265 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml @@ -1,11 +1,11 @@ -spokenForm: take key languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take key + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml index 4cde8fac1b..a0e9ec577a 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml @@ -1,11 +1,11 @@ -spokenForm: take start tag languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take start tag + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: xmlStartTag} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml index da00eb08e8..0ef5356ed5 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml @@ -1,11 +1,11 @@ -spokenForm: take tags languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take tags + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: xmlBothTags} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml index a8c27dbf70..b1c834b296 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: javascript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml b/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml index f22fc10dfd..38f45aa8c6 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml @@ -1,11 +1,11 @@ -spokenForm: chuck key languageId: python command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck key + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml b/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml index a4a0cbf99a..e273a6775e 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml @@ -1,11 +1,11 @@ -spokenForm: chuck key languageId: python command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck key + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckType.yml b/src/test/suite/fixtures/recorded/languages/python/chuckType.yml index 39ae64bf80..64f93527a5 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckType.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckType.yml @@ -1,11 +1,11 @@ -spokenForm: chuck type languageId: python command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} - extraArgs: [] initialState: documentContents: "foo: str = 'hello'" selections: diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml index 421714d67d..c5b9597555 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type soon languageId: python command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type soon + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: s} - extraArgs: [] initialState: documentContents: |- def my_funk(value: str) -> str: diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml b/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml index 09c145d10c..e217856e45 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type trap languageId: python command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type trap + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: t} - extraArgs: [] initialState: documentContents: |- def my_funk(value: str) -> str: diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml b/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml index 1bcd51aaaf..ecb3e56146 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml @@ -1,11 +1,11 @@ -spokenForm: chuck value languageId: python command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck value + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} - extraArgs: [] initialState: documentContents: "foo: str = \"hello\"" selections: diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml b/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml index f05e1dcd66..d1fc53f432 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml @@ -1,11 +1,11 @@ -spokenForm: chuck value languageId: python command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck value + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- def foo(): diff --git a/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml b/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml index 3da5bcfa73..445ae8529e 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml @@ -1,11 +1,11 @@ -spokenForm: clear every value languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear every value + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: true} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/languages/python/clearValue.yml b/src/test/suite/fixtures/recorded/languages/python/clearValue.yml index 77bd664c13..0b9c08e225 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearValue.yml @@ -1,11 +1,11 @@ -spokenForm: clear value languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear value + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- def foo(): diff --git a/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml b/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml index fce28308da..8039c0d604 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml @@ -1,11 +1,11 @@ -spokenForm: clear value languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear value + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- def foo(): diff --git a/src/test/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml index 5c86ef04e1..035d33d336 100644 --- a/src/test/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: else state wrap this languageId: python command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: else state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.alternative] diff --git a/src/test/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml b/src/test/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml index c4fc2a948d..07376a86a6 100644 --- a/src/test/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if else wrap this languageId: python command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if else wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml index 37c57fad89..80d3f46e64 100644 --- a/src/test/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if state wrap this languageId: python command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeArg.yml b/src/test/suite/fixtures/recorded/languages/python/takeArg.yml index 326e663874..9c8947a8e1 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeArg.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml index 95a1df540a..bddf4bb33a 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeCall.yml b/src/test/suite/fixtures/recorded/languages/python/takeCall.yml index 12580c7160..de09da9a18 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCall.yml @@ -1,11 +1,11 @@ -spokenForm: take call languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take call + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionCall} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeClass.yml b/src/test/suite/fixtures/recorded/languages/python/takeClass.yml index 0ea57000b3..98546a0292 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClass.yml @@ -1,11 +1,11 @@ -spokenForm: take class languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: class} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml b/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml index afa6b63920..0cb9c7995d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml @@ -1,11 +1,11 @@ -spokenForm: take class languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: class} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml index 94146ccf54..b6fa235281 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml @@ -1,11 +1,11 @@ -spokenForm: take class name languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: className} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeComment.yml b/src/test/suite/fixtures/recorded/languages/python/takeComment.yml index 28548f4698..22586b6330 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeComment.yml @@ -1,11 +1,11 @@ -spokenForm: take comment languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take comment + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: comment} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml b/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml index a25ae41afc..a566c913db 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- if True: diff --git a/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml b/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml index 3368179015..24712f0dd7 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- if True: diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml index 71297d1bff..19ff2e0574 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml @@ -1,11 +1,11 @@ -spokenForm: take every arg languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml index 92a4254b7f..46a3d67bea 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml @@ -1,11 +1,11 @@ -spokenForm: take every arg languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml index e5be4d7cf9..86069db710 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml index be11b442b9..a9379d87ea 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml index a673026297..8096ecd3f9 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml index 108f707a87..499d7cab6a 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml index f75ff23acd..c41b35ee78 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml index 207b2b9ccc..d7aaed8fae 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeIf.yml b/src/test/suite/fixtures/recorded/languages/python/takeIf.yml index 1fbb205d91..33eb9a2dbf 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeIf.yml @@ -1,11 +1,11 @@ -spokenForm: take if languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take if + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: ifStatement} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeItem.yml b/src/test/suite/fixtures/recorded/languages/python/takeItem.yml index 0a427bc305..8dd3a0f787 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml index 880be0052d..ddc95a1f2f 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml b/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml index 42749b500b..cee30f2163 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeKey.yml b/src/test/suite/fixtures/recorded/languages/python/takeKey.yml index d304ba08e8..6360270c26 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeKey.yml @@ -1,11 +1,11 @@ -spokenForm: take key languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take key + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml b/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml index cc1f3b60b0..9e8157d31d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml @@ -1,11 +1,11 @@ -spokenForm: take lambda languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take lambda + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml b/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml index 11ce981c36..ed35b6f4f9 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml @@ -1,12 +1,12 @@ -spokenForm: take lambda made languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take lambda made + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: m} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml b/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml index 123be90eff..a6b298ce99 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml @@ -1,12 +1,12 @@ -spokenForm: take lambda pit languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take lambda pit + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: p} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeList.yml b/src/test/suite/fixtures/recorded/languages/python/takeList.yml index 6cef2d88f1..10a33da827 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeList.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeList2.yml b/src/test/suite/fixtures/recorded/languages/python/takeList2.yml index 197fbbd9d7..fcf4c7511d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeList2.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeMap.yml b/src/test/suite/fixtures/recorded/languages/python/takeMap.yml index a42674ef4d..f081270564 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeMap.yml @@ -1,11 +1,11 @@ -spokenForm: take map languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take map + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: map} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeName.yml b/src/test/suite/fixtures/recorded/languages/python/takeName.yml index 19efb4e4e4..c9d244eadc 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeName2.yml b/src/test/suite/fixtures/recorded/languages/python/takeName2.yml index a00990259d..7b3c1d7ffc 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName2.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeName3.yml b/src/test/suite/fixtures/recorded/languages/python/takeName3.yml index 0430face6d..4fa80b0f77 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName3.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/python/takeState.yml b/src/test/suite/fixtures/recorded/languages/python/takeState.yml index 170a03ac03..aa70dd2c16 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeState.yml @@ -1,11 +1,11 @@ -spokenForm: take state languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take state + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: statement} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeString.yml b/src/test/suite/fixtures/recorded/languages/python/takeString.yml index 895f4b4c18..0ff66931d4 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeString.yml @@ -1,11 +1,11 @@ -spokenForm: take string languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take string + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: string} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeType.yml b/src/test/suite/fixtures/recorded/languages/python/takeType.yml index 3b9bbfa4a4..122520710f 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeType.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeType2.yml b/src/test/suite/fixtures/recorded/languages/python/takeType2.yml index f6893713d1..084814f9c5 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeType2.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeValue.yml b/src/test/suite/fixtures/recorded/languages/python/takeValue.yml index 7d56dc8d76..93ea5e8fa3 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValue.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml b/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml index cbad9b0e2a..dcd5ccf766 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml b/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml index c93d0b9d0e..046ed45fa9 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml @@ -1,12 +1,12 @@ -spokenForm: take value zero languageId: python command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value zero + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: '0'} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml b/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml index 752168ac51..5eadc64a99 100644 --- a/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: python command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml b/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml index 9f0096c789..c232fc8715 100644 --- a/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: python command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml index c6e8a632ea..443a37634e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml @@ -1,11 +1,11 @@ -spokenForm: chuck key languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck key + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml index 3de784ef28..583489d80e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type ram languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type ram + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: r} - extraArgs: [] initialState: documentContents: "const hello: string = \"hello\";" selections: diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml index 4381e6b83c..e13e7bfb59 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type soon languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type soon + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: s} - extraArgs: [] initialState: documentContents: |- function myFunk (value: string): string { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml index 05322105ea..db5007f49c 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type soon languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type soon + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: s} - extraArgs: [] initialState: documentContents: |- interface MyType { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml index 1d609a74b3..aea2e9aa2b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type trap languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type trap + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: t} - extraArgs: [] initialState: documentContents: |- function myFunk (value: string): string { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml index ffdcce875c..432653961b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml @@ -1,12 +1,12 @@ -spokenForm: chuck type yank languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck type yank + action: remove + targets: - type: primitive modifier: {type: containingScope, scopeType: type, includeSiblings: false} mark: {type: decoratedSymbol, symbolColor: default, character: 'y'} - extraArgs: [] initialState: documentContents: |- interface MyType { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml index 47ad5a137f..3eade2f5a9 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml @@ -1,11 +1,11 @@ -spokenForm: clear funk languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear funk + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false} - extraArgs: [] initialState: documentContents: | function bar() { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml index a998a711a6..26dc5bccc7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml @@ -1,11 +1,11 @@ -spokenForm: clear funk languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear funk + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false} - extraArgs: [] initialState: documentContents: | function bar() { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml index 320b45e5fa..95017e1f16 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml @@ -1,11 +1,11 @@ -spokenForm: clear key languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear key + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml index 19c65bbece..2460a946ad 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml @@ -1,11 +1,11 @@ -spokenForm: clear lambda languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear lambda + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- foo(() => { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml index 9c727e9965..52a5ed28e3 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml @@ -1,11 +1,11 @@ -spokenForm: clear lambda languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear lambda + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- foo(function () { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml index a233b2f19c..80b5332710 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml @@ -1,11 +1,11 @@ -spokenForm: clear lambda languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear lambda + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- foo(async function () { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml index d63e26d638..a01bc490b4 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml @@ -1,11 +1,11 @@ -spokenForm: clear lambda languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear lambda + action: clearAndSetSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- foo(async () => { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml index b1b29f0d9e..ba456b8ef3 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: else state wrap this languageId: typescript command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: else state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.alternative] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml b/src/test/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml index fa06b13bd0..d470612657 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if else wrap this languageId: typescript command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if else wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifElseStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml b/src/test/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml index 77bd1d2773..ed5a2b7342 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: if state wrap this languageId: typescript command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: if state wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [ifStatement.consequence] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml index 1590c7aa3b..c99ef33358 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml index 15380073b2..b721c2d93f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml @@ -1,11 +1,11 @@ -spokenForm: take arg languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arg + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml index 0ef8a1fbd1..406fa70b17 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml @@ -1,11 +1,11 @@ -spokenForm: take arrow languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take arrow + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: anonymousFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml index 9a1f0498bf..743c490365 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml @@ -1,11 +1,11 @@ -spokenForm: take call languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take call + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionCall} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml index a56254c272..b74ef46c83 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml @@ -1,11 +1,11 @@ -spokenForm: take class languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: class} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml index b7698c5e8e..841869a53b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml @@ -1,11 +1,11 @@ -spokenForm: take class name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take class name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: className} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml index 22b10a41c4..90e4846dc8 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml @@ -1,11 +1,11 @@ -spokenForm: take comment languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take comment + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: comment} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml index 355b89bc00..dc84f6a8f2 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- if (true) { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml index 16d5a0c564..6871a0ae09 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- if (true) { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml index eb4a3d844c..771b50e5a2 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml @@ -1,11 +1,11 @@ -spokenForm: take condition languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take condition + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: condition, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- if (true) { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml index c6571b02c4..b9ef37a268 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml @@ -1,12 +1,12 @@ -spokenForm: take every arg air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg air + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: foo(bar(baz, bongo), bazman) selections: diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml index c74a1a771d..f2195d7bab 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml @@ -1,12 +1,12 @@ -spokenForm: take every arg bat languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg bat + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} mark: {type: decoratedSymbol, symbolColor: default, character: b} - extraArgs: [] initialState: documentContents: foo(bar(baz, bongo), bazman) selections: diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml index a46abc0032..9ab231825c 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml @@ -1,12 +1,12 @@ -spokenForm: take every arg ram languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every arg ram + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true} mark: {type: decoratedSymbol, symbolColor: default, character: r} - extraArgs: [] initialState: documentContents: foo(bar(baz, bongo), bazman) selections: diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml index f87773007e..16c929b204 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml index 45e8a2e0a4..ec4d2eafca 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml index 45ab4879e3..fa297bb639 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml index f52b3a60b2..af7334675f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml index 6467f897ef..77273f2662 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml @@ -1,11 +1,11 @@ -spokenForm: take every item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true} - extraArgs: [] initialState: documentContents: |- const value = { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml index 5d756fa046..1434eae771 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml @@ -1,11 +1,11 @@ -spokenForm: take every key languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every key + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true} - extraArgs: [] initialState: documentContents: |- const value = { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml index 9c75339448..6bd5bac823 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml @@ -1,11 +1,11 @@ -spokenForm: take every value languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take every value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: true} - extraArgs: [] initialState: documentContents: |- const value = { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml index e6d9c12c81..2dc738d9ec 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml index bf5c50b962..78fb8fa266 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml index 7f9351d9f0..dbe2573f2d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml index 331d8b1215..8828cdb518 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml index 05cda11720..5b7a665361 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml index e16853bb68..002c52efbf 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml index 3e8a7fbf18..9759b32086 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml index cb85325a55..5e4d1f887f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml index cd0bce82b3..701e6b13cb 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml index 83251f6f08..beab594c75 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml index c4cba3be08..a690b85262 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml index 7d3df6b01b..69b512d04d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml index e60eb49254..4f2e8f24ad 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml @@ -1,11 +1,11 @@ -spokenForm: take funk languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: namedFunction} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml index 012288685f..ae000d99fd 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml index be3454bcee..b6f87181a6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml index 000e08fd71..26d8edc501 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml index 6ff89ae3b7..3e3d9fb3d5 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml index 270b03da0e..23e6830390 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml index 9ba60988d6..bd93be6932 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml index a3574eca22..a39b14eb3a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml index 24e5647fd3..31892438af 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml index 28682c73f5..8760b43fe6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml index 90e56db0b8..9cc39100bf 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml index dded2f9a30..195ca75d91 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml @@ -1,11 +1,11 @@ -spokenForm: take funk name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take funk name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: functionName} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml index 9ca87b1e69..1c944be180 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml @@ -1,11 +1,11 @@ -spokenForm: take if languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take if + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: ifStatement} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml index a3a9da467d..9f65586ae3 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml index a5c791847d..ae5b5043c7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml index dbb3b49dbb..5be200d04d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml index 4a434ba9bf..d6669e85c1 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml @@ -1,11 +1,11 @@ -spokenForm: take item languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml index 7d339a0ee1..2bc76aa612 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml @@ -1,12 +1,12 @@ -spokenForm: take item air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item air + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml index 21ea684c3e..a562da0bfb 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml @@ -1,12 +1,12 @@ -spokenForm: take item brace languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item brace + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} mark: {type: decoratedSymbol, symbolColor: default, character: '{'} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml index be8c0fae68..95ee786767 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml @@ -1,12 +1,12 @@ -spokenForm: take item comma languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item comma + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} mark: {type: decoratedSymbol, symbolColor: default, character: ','} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml index dc7a603860..9a65704f0f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml @@ -1,12 +1,12 @@ -spokenForm: take item one languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take item one + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionItem} mark: {type: decoratedSymbol, symbolColor: default, character: '1'} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml index bd5cb3103f..7653ea1456 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml @@ -1,11 +1,11 @@ -spokenForm: take key languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take key + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: collectionKey} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml index 280ec65464..95bf72685d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml index 2dbe0b67b2..9ffbc57379 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml @@ -1,11 +1,11 @@ -spokenForm: take list languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take list + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: list} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml index 6cb4dcf700..6995b91e3b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml @@ -1,11 +1,11 @@ -spokenForm: take map languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take map + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: map} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml index 8dec321bb7..4057d8d7c9 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml @@ -1,11 +1,11 @@ -spokenForm: take map languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take map + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: map} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml index ea99574ad6..671c043078 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml index 2c99a8e1b6..70d13c5c86 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml @@ -1,11 +1,11 @@ -spokenForm: take name languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take name + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: name} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml index a0f28d08c6..3bec48427a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml @@ -1,11 +1,11 @@ -spokenForm: take regex languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take regex + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: regularExpression} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml index e5b941baf7..f0d631f4a8 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml @@ -1,11 +1,11 @@ -spokenForm: take state languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take state + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: statement} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeState2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeState2.yml index cc9280e1d0..601088c003 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeState2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeState2.yml @@ -1,11 +1,11 @@ -spokenForm: take state languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take state + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: statement, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- if (true) { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml index 669e8ba928..002ae27594 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml @@ -1,11 +1,11 @@ -spokenForm: take string languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take string + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: string} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml index 0f4f4fc107..357160bfb7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml index 7b513e8d13..f3e245240a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml @@ -1,11 +1,11 @@ -spokenForm: take type languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take type + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: type} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml index f17727fecc..c510fc8b74 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml index 9f2442d45e..0e0eb5fd0c 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml index 4f6c9a71cb..5adb150572 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- function foo() { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml index 37f6972b2b..080f00603b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml @@ -1,11 +1,11 @@ -spokenForm: take value languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take value + action: setSelection + targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- function foo() { diff --git a/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml b/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml index 2a06a44a39..f0cb2a87b6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: typescript command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml b/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml index 837fd8170c..b277447c0a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml @@ -1,8 +1,9 @@ -spokenForm: try catch wrap this languageId: typescript command: - actionName: wrapWithSnippet - partialTargets: + version: 1 + spokenForm: try catch wrap this + action: wrapWithSnippet + targets: - type: primitive mark: {type: cursor} extraArgs: [tryCatchStatement.body] diff --git a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml index 77383154be..5453ffd5cd 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml @@ -1,11 +1,11 @@ -spokenForm: chuck vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck vest + action: remove + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml index 88a2949955..17f9c403f4 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml @@ -1,11 +1,11 @@ -spokenForm: chuck vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck vest + action: remove + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: "\r\nconst value = \"Hello world\";\r\n" selections: diff --git a/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml b/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml index 2a53660ba1..cfe0ce99db 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml @@ -1,11 +1,11 @@ -spokenForm: drop vest languageId: typescript command: - actionName: insertEmptyLineBefore - partialTargets: + version: 1 + spokenForm: drop vest + action: insertEmptyLineBefore + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml b/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml index d727c473f2..023818c8ed 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml @@ -1,11 +1,11 @@ -spokenForm: drop vest languageId: typescript command: - actionName: insertEmptyLineBefore - partialTargets: + version: 1 + spokenForm: drop vest + action: insertEmptyLineBefore + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: "\r\nconst value = \"Hello world\";\r\n" selections: diff --git a/src/test/suite/fixtures/recorded/marks/takeDownOne.yml b/src/test/suite/fixtures/recorded/marks/takeDownOne.yml index 57e1860d44..eee72b690c 100644 --- a/src/test/suite/fixtures/recorded/marks/takeDownOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeDownOne.yml @@ -1,15 +1,15 @@ -spokenForm: take down one languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take down one + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: 1, type: relative} active: {lineNumber: 1, type: relative} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml b/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml index da363afe6c..c1cc5dd608 100644 --- a/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml +++ b/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml @@ -1,15 +1,15 @@ -spokenForm: take down one past three languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take down one past three + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: 1, type: relative} active: {lineNumber: 3, type: relative} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/marks/takeRowFive.yml b/src/test/suite/fixtures/recorded/marks/takeRowFive.yml index 8de57dc56e..33c6661549 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowFive.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowFive.yml @@ -1,15 +1,15 @@ -spokenForm: take row five languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row five + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: 4, type: modulo100} active: {lineNumber: 4, type: modulo100} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/marks/takeRowFour.yml b/src/test/suite/fixtures/recorded/marks/takeRowFour.yml index 91b6504147..70f04d7fb5 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowFour.yml @@ -1,15 +1,15 @@ -spokenForm: take row four languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row four + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: 3, type: absolute} active: {lineNumber: 3, type: absolute} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/marks/takeRowOne.yml b/src/test/suite/fixtures/recorded/marks/takeRowOne.yml index 29b747cb0f..d0534e3245 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowOne.yml @@ -1,15 +1,15 @@ -spokenForm: take row one languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row one + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: 0, type: modulo100} active: {lineNumber: 0, type: modulo100} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml index 134bc7216d..9c6d9e69d1 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml @@ -1,15 +1,15 @@ -spokenForm: take row two past down three languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row two past down three + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: 1, type: absolute} active: {lineNumber: 3, type: relative} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml index 4c10227393..41cb8780ec 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml @@ -1,15 +1,15 @@ -spokenForm: take row two past four languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row two past four + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: 1, type: absolute} active: {lineNumber: 3, type: absolute} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/marks/takeSource.yml b/src/test/suite/fixtures/recorded/marks/takeSource.yml index da79a0e73e..43ad9060af 100644 --- a/src/test/suite/fixtures/recorded/marks/takeSource.yml +++ b/src/test/suite/fixtures/recorded/marks/takeSource.yml @@ -1,11 +1,11 @@ -spokenForm: take source languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take source + action: setSelection + targets: - type: primitive mark: {type: source} - extraArgs: [] initialState: documentContents: | value diff --git a/src/test/suite/fixtures/recorded/marks/takeThat.yml b/src/test/suite/fixtures/recorded/marks/takeThat.yml index be69ef3490..aa2baaf21c 100644 --- a/src/test/suite/fixtures/recorded/marks/takeThat.yml +++ b/src/test/suite/fixtures/recorded/marks/takeThat.yml @@ -1,11 +1,11 @@ -spokenForm: take that languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take that + action: setSelection + targets: - type: primitive mark: {type: that} - extraArgs: [] initialState: documentContents: | value diff --git a/src/test/suite/fixtures/recorded/marks/takeThis.yml b/src/test/suite/fixtures/recorded/marks/takeThis.yml index e88be39a35..8348c8763e 100644 --- a/src/test/suite/fixtures/recorded/marks/takeThis.yml +++ b/src/test/suite/fixtures/recorded/marks/takeThis.yml @@ -1,11 +1,11 @@ -spokenForm: take this languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take this + action: setSelection + targets: - type: primitive mark: {type: cursor} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml b/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml index 1b1598cf2b..b124241e85 100644 --- a/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml @@ -1,15 +1,15 @@ -spokenForm: take up one past down one languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take up one past down one + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: -1, type: relative} active: {lineNumber: 1, type: relative} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml b/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml index 69b0e7e2e5..a1b96d42ae 100644 --- a/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml @@ -1,15 +1,15 @@ -spokenForm: take up one past row four languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take up one past row four + action: setSelection + targets: - type: primitive selectionType: line mark: type: lineNumber anchor: {lineNumber: -1, type: relative} active: {lineNumber: 3, type: absolute} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml index 569f02aaf2..cfdd988bfe 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml @@ -1,13 +1,13 @@ -spokenForm: chuck after block vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck after block vest + action: remove + targets: - type: primitive position: after selectionType: paragraph mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml index ccb2f3663c..56e681336d 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml @@ -1,12 +1,12 @@ -spokenForm: chuck after harp languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck after harp + action: remove + targets: - type: primitive position: after mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: | "hello " diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml index 4ce303c055..782e48556d 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml @@ -1,13 +1,13 @@ -spokenForm: chuck after line vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck after line vest + action: remove + targets: - type: primitive position: after selectionType: line mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml index c6273f1c56..ca89626b92 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml @@ -1,12 +1,12 @@ -spokenForm: chuck after look languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck after look + action: remove + targets: - type: primitive position: after mark: {type: decoratedSymbol, symbolColor: default, character: l} - extraArgs: [] initialState: documentContents: | "hello " diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml index 341acfe964..d199f88cce 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck after vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck after vest + action: remove + targets: - type: primitive position: after mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/positions/chuckAir.yml b/src/test/suite/fixtures/recorded/positions/chuckAir.yml index 71a4cef605..4f4c35bc45 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAir.yml @@ -1,11 +1,11 @@ -spokenForm: chuck air languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck air + action: remove + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | "hello " diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml index dbf0bc6b00..21effed70c 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml @@ -1,12 +1,12 @@ -spokenForm: chuck before air languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck before air + action: remove + targets: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | "hello " diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml index 87ed81105d..31d34664c0 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml @@ -1,13 +1,13 @@ -spokenForm: chuck before block air languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck before block air + action: remove + targets: - type: primitive position: before selectionType: paragraph mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml index 6504154bc5..77483adff0 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml @@ -1,12 +1,12 @@ -spokenForm: chuck before each languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck before each + action: remove + targets: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: e} - extraArgs: [] initialState: documentContents: | "hello " diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml index bc5aa41642..3b8427314e 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml @@ -1,12 +1,12 @@ -spokenForm: chuck before harp languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck before harp + action: remove + targets: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: | "hello " diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml index 7d10159f52..28d96d84d3 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml @@ -1,13 +1,13 @@ -spokenForm: chuck before line air languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck before line air + action: remove + targets: - type: primitive position: before selectionType: line mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml index d653d834ef..66a1def52e 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck before vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck before vest + action: remove + targets: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml b/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml index d41789ce95..005c07a9f3 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml @@ -1,8 +1,9 @@ -spokenForm: chuck past after look languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck past after look + action: remove + targets: - type: range start: {type: primitive} end: @@ -11,7 +12,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: l} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml b/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml index bf7c0c56d5..e9940b52ad 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml @@ -1,8 +1,9 @@ -spokenForm: chuck past before trap languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck past before trap + action: remove + targets: - type: range start: {type: primitive} end: @@ -11,7 +12,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: t} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml index f19ef724ba..2aa194fa69 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml @@ -1,14 +1,14 @@ -spokenForm: chuck past end of line languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck past end of line + action: remove + targets: - type: range start: {type: primitive} end: {type: primitive, position: after, insideOutsideType: inside, selectionType: line} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml index 2501b4b2e1..7effdfdc01 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml @@ -1,8 +1,9 @@ -spokenForm: chuck past end of look languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck past end of look + action: remove + targets: - type: range start: {type: primitive} end: @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: l} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml b/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml index 9fd0e174a7..1bf8a8c856 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml @@ -1,8 +1,9 @@ -spokenForm: chuck past start of trap languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck past start of trap + action: remove + targets: - type: range start: {type: primitive} end: @@ -12,7 +13,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: t} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: hello there selections: diff --git a/src/test/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml b/src/test/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml index 4726f11ae1..ea845c269f 100644 --- a/src/test/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml +++ b/src/test/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml @@ -1,8 +1,9 @@ -spokenForm: replace after vest with hallo languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: replace after vest with hallo + action: replace + targets: - type: primitive position: after mark: {type: decoratedSymbol, symbolColor: default, character: v} diff --git a/src/test/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml b/src/test/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml index 1ca57fb033..c461c1a82e 100644 --- a/src/test/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml +++ b/src/test/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml @@ -1,8 +1,9 @@ -spokenForm: replace before vest with hello languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: replace before vest with hello + action: replace + targets: - type: primitive position: before mark: {type: decoratedSymbol, symbolColor: default, character: v} diff --git a/src/test/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml b/src/test/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml index e5ddca6569..695a21abc6 100644 --- a/src/test/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml +++ b/src/test/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml @@ -1,8 +1,9 @@ -spokenForm: replace end of vest with hello languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: replace end of vest with hello + action: replace + targets: - type: primitive position: after insideOutsideType: inside diff --git a/src/test/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml b/src/test/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml index efb42df632..8ff693acd0 100644 --- a/src/test/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml +++ b/src/test/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml @@ -1,8 +1,9 @@ -spokenForm: replace start of vest with hello languageId: typescript command: - actionName: replace - partialTargets: + version: 1 + spokenForm: replace start of vest with hello + action: replace + targets: - type: primitive position: before insideOutsideType: inside diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToAfterColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToAfterColumnBatPastFine.yml index 9ff0af8bf1..e8cfb841f3 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToAfterColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToAfterColumnBatPastFine.yml @@ -1,8 +1,9 @@ -spokenForm: bring air to after column bat past fine languageId: markdown command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air to after column bat past fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: range @@ -16,7 +17,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: f} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml index 934f7f97f8..c572635ce5 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml @@ -1,8 +1,9 @@ -spokenForm: bring air to before column bat past fine languageId: markdown command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air to before column bat past fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: range @@ -16,7 +17,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: f} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml index 47a9385e1a..ccc1632363 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml @@ -1,8 +1,9 @@ -spokenForm: bring air to column bat past fine languageId: markdown command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air to column bat past fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: range @@ -15,7 +16,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: f} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml index 23009406d4..2146a254dd 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml @@ -1,8 +1,9 @@ -spokenForm: bring air to end of column bat past fine languageId: markdown command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air to end of column bat past fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: range @@ -17,7 +18,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: f} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml index 42533e9c52..5ac8f7bc52 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml @@ -1,8 +1,9 @@ -spokenForm: bring air to start of column bat past fine languageId: markdown command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring air to start of column bat past fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: a} - type: range @@ -17,7 +18,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: f} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | a diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml index 2459c621ee..fd8f46eb1d 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml @@ -1,12 +1,12 @@ -spokenForm: chuck block air languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck block air + action: remove + targets: - type: primitive selectionType: paragraph mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml index dd5680b95e..ca5e33cefd 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml @@ -1,12 +1,12 @@ -spokenForm: chuck block air languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck block air + action: remove + targets: - type: primitive selectionType: paragraph mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml index e44b5a6334..34c5915180 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck block vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck block vest + action: remove + targets: - type: primitive selectionType: paragraph mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml index 84be045565..2391dd90b4 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml @@ -1,10 +1,10 @@ -spokenForm: chuck file languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck file + action: remove + targets: - {type: primitive, selectionType: document} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml index bc1e7c1126..e0b02eb679 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck line vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck line vest + action: remove + targets: - type: primitive selectionType: line mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml index 077e64f49a..395d3ca9e8 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml @@ -1,12 +1,12 @@ -spokenForm: chuck line vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck line vest + action: remove + targets: - type: primitive selectionType: line mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml index a8a56d151f..f0c85eff24 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck token vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck token vest + action: remove + targets: - type: primitive selectionType: token mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml b/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml index f0233f59b8..b86c6b5711 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml @@ -1,10 +1,10 @@ -spokenForm: drink cell languageId: python command: - actionName: editNewLineBefore - partialTargets: + version: 1 + spokenForm: drink cell + action: editNewLineBefore + targets: - {type: primitive, selectionType: notebookCell} - extraArgs: [] initialState: documentContents: |- # %% diff --git a/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml index b282b8a888..bc152f2168 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml @@ -1,12 +1,12 @@ -spokenForm: drink cell each languageId: python command: - actionName: editNewLineBefore - partialTargets: + version: 1 + spokenForm: drink cell each + action: editNewLineBefore + targets: - type: primitive selectionType: notebookCell mark: {type: decoratedSymbol, symbolColor: default, character: e} - extraArgs: [] initialState: documentContents: |- # %% diff --git a/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml index 8f4593f8a3..50e59e9d65 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml @@ -1,8 +1,9 @@ -spokenForm: post column whale until each languageId: markdown command: - actionName: setSelectionAfter - partialTargets: + version: 1 + spokenForm: post column whale until each + action: setSelectionAfter + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: e} excludeStart: false excludeEnd: true - extraArgs: [] initialState: documentContents: | hello world ! diff --git a/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml b/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml index 2282aa5fbf..4a4c3f5252 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml @@ -1,10 +1,10 @@ -spokenForm: pour cell languageId: python command: - actionName: editNewLineAfter - partialTargets: + version: 1 + spokenForm: pour cell + action: editNewLineAfter + targets: - {type: primitive, selectionType: notebookCell} - extraArgs: [] initialState: documentContents: |- # %% diff --git a/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml index 6817199e8a..e034cdd54d 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml @@ -1,12 +1,12 @@ -spokenForm: pour cell each languageId: python command: - actionName: editNewLineAfter - partialTargets: + version: 1 + spokenForm: pour cell each + action: editNewLineAfter + targets: - type: primitive selectionType: notebookCell mark: {type: decoratedSymbol, symbolColor: default, character: e} - extraArgs: [] initialState: documentContents: |- # %% diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml index d0c2446b21..481ed99210 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml @@ -1,12 +1,12 @@ -spokenForm: take block air languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take block air + action: setSelection + targets: - type: primitive selectionType: paragraph mark: {type: decoratedSymbol, symbolColor: default, character: a} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml index 4784d0b73d..6d4a34d8f8 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml @@ -1,8 +1,9 @@ -spokenForm: take column air past each languageId: markdown command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take column air past each + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: e} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | hello world ! diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml index 553bdf1fec..bc3612ee2d 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml @@ -1,8 +1,9 @@ -spokenForm: take column look past air languageId: markdown command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take column look past air + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: a} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: | hello world ! diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml index 6f64c366df..fe93e6e5a8 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml @@ -1,8 +1,9 @@ -spokenForm: take column until each languageId: markdown command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take column until each + action: setSelection + targets: - type: range start: {type: primitive, selectionType: column} end: @@ -10,7 +11,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: e} excludeStart: false excludeEnd: true - extraArgs: [] initialState: documentContents: | hello world ! diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml index 6c21316a78..28f8fcedda 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml @@ -1,8 +1,9 @@ -spokenForm: take column whale between ram languageId: markdown command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take column whale between ram + action: setSelection + targets: - type: range start: type: primitive @@ -13,7 +14,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: r} excludeStart: true excludeEnd: true - extraArgs: [] initialState: documentContents: | hello world ! diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml index a0eb6f54e6..7d546f6ee1 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml @@ -1,10 +1,10 @@ -spokenForm: take file languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take file + action: setSelection + targets: - {type: primitive, selectionType: document} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml index 9d3fa9fa95..94b8e4c8f7 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml @@ -1,12 +1,12 @@ -spokenForm: take line vest languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take line vest + action: setSelection + targets: - type: primitive selectionType: line mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml index 2dcfb10d4a..9cf3633699 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml @@ -1,12 +1,12 @@ -spokenForm: take token vest languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take token vest + action: setSelection + targets: - type: primitive selectionType: token mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml index 351b2e54cc..5e668b5648 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck first char vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck first char vest + action: remove + targets: - type: primitive modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml index 09d937f422..c4226226c2 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck first word vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck first word vest + action: remove + targets: - type: primitive modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml index 3386224d4e..08acf54a9e 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck last char vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck last char vest + action: remove + targets: - type: primitive modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml index 22620b4bbe..97e76a9089 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck last word vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck last word vest + action: remove + targets: - type: primitive modifier: {type: subpiece, pieceType: word, anchor: -1, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml index a6071f49a9..4b3c750ada 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck second word vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck second word vest + action: remove + targets: - type: primitive modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml index a929925fc3..14e1d88e43 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml @@ -1,12 +1,12 @@ -spokenForm: chuck sixth char vest languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck sixth char vest + action: remove + targets: - type: primitive modifier: {type: subpiece, pieceType: character, anchor: 5, active: 5} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml index b696500ea5..51e9cefef1 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml @@ -1,12 +1,12 @@ -spokenForm: clear first char vest languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear first char vest + action: clearAndSetSelection + targets: - type: primitive modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml index ecc050e57b..9791efc730 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml @@ -1,12 +1,12 @@ -spokenForm: clear first word vest languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear first word vest + action: clearAndSetSelection + targets: - type: primitive modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml index 4369857140..dbd5ff2094 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml @@ -1,12 +1,12 @@ -spokenForm: clear last char vest languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear last char vest + action: clearAndSetSelection + targets: - type: primitive modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml index 2fca87e41d..02a980c88d 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml @@ -1,12 +1,12 @@ -spokenForm: clear last word vest languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear last word vest + action: clearAndSetSelection + targets: - type: primitive modifier: {type: subpiece, pieceType: word, anchor: -1, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml index f13e2a07c3..88ffef0c7f 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml @@ -1,12 +1,12 @@ -spokenForm: clear second word vest languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear second word vest + action: clearAndSetSelection + targets: - type: primitive modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml index 563cb85bf3..94f88819aa 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml @@ -1,12 +1,12 @@ -spokenForm: clear sixth char vest languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear sixth char vest + action: clearAndSetSelection + targets: - type: primitive modifier: {type: subpiece, pieceType: character, anchor: 5, active: 5} mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml index 8d59884ed7..c98a1a0d4a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml @@ -1,12 +1,12 @@ -spokenForm: take first char languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first char + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0} - extraArgs: [] initialState: documentContents: //aa selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml index 34fd2e4d71..3608da06c5 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml @@ -1,12 +1,12 @@ -spokenForm: take first char languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first char + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0} - extraArgs: [] initialState: documentContents: aa// selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml index 818cf7886d..36bfd1664d 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml @@ -1,12 +1,12 @@ -spokenForm: take first char languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first char + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0} - extraArgs: [] initialState: documentContents: ///** selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml index 0a6452a427..325f42ced8 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml @@ -1,12 +1,12 @@ -spokenForm: take first char languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first char + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0} - extraArgs: [] initialState: documentContents: //*** selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml index 45c014e7fa..300237926a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml @@ -1,12 +1,12 @@ -spokenForm: take first char languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first char + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0} - extraArgs: [] initialState: documentContents: //** selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml index 05d29e77c9..121dfdcd97 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take first past last char harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first past last char harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml index 4bea4c413a..178145922e 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take first past last word harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first past last word harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: 0, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml index 1837da0cd0..b54938138a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take first past second word harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first past second word harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: 0, active: 1} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml index f9aa0dca15..77adc861cd 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take first three char harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first three char harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 2} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml index c9814ef88b..ebebfff3d7 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take first two word harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first two word harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: 0, active: 1} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml index d0dfbfafdd..5c95a51454 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml @@ -1,12 +1,12 @@ -spokenForm: take first word languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take first word + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0} - extraArgs: [] initialState: documentContents: ;helloThere; selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml index c929b37471..4c47bd5c43 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take last past first char harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take last past first char harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: -1, active: 0} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml index d798d5cf9b..31ba144744 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take last past first word harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take last past first word harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: -1, active: 0} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml index e0a98cbdb4..286a3cc17b 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take last three char harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take last three char harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: -3, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml index 791ddc175a..9df1a90333 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take last two word harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take last two word harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: -2, active: -1} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml index b2f52ad662..76a8e224e5 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml @@ -1,8 +1,9 @@ -spokenForm: take second char look past end of token languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take second char look past end of token + action: setSelection + targets: - type: range start: type: primitive @@ -12,7 +13,6 @@ command: end: {type: primitive, position: after, insideOutsideType: inside, selectionType: token} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: " hello there" selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml index 7dc54f538d..2a97455876 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml @@ -1,8 +1,9 @@ -spokenForm: take second char look past second char trap languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take second char look past second char trap + action: setSelection + targets: - type: range start: type: primitive @@ -16,7 +17,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: t} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: " hello there" selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml b/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml index aa22f6319f..dbe470070d 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml @@ -1,12 +1,12 @@ -spokenForm: take second word languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take second word + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1} - extraArgs: [] initialState: documentContents: ;helloThere; selections: diff --git a/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml index 66e8dad462..c8a02359c1 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml @@ -1,13 +1,13 @@ -spokenForm: take third past second word harp languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take third past second word harp + action: setSelection + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: word, anchor: 2, active: 1} mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] initialState: documentContents: |+ diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml index 089408675e..74cd7901d3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml index b9a9316b82..8dc1b6131a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml index b0e735b416..e15ca9f8f9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml index 39bbc1ae32..5228cd5c60 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml index e2d930ae5f..ceefcf847a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml index 6ab3f755f5..3882b1c6fc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml index da0cc2d655..0fc3870282 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml index d7278f9743..25b9de2896 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml index 1ab408d893..aac4c106f7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml index f1b0e0192b..a3e6ff0276 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml index c82e8c3467..ed0489bf71 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml index a695c3f981..3a1428066c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml index 79944baaeb..b9bc61550d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml index 1bb04c7a36..79a1eaedb4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml index ae5df502be..14b96bc3b6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml index d09eca7c98..81eb2ab4d2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml index c7cdc1be00..3378ce85a1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: html command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml index e645f33b1e..94c442b808 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: cpp command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "\"hello\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml index ad8722c2c3..178eb1340e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: cpp command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: "\"(hello)\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml index f66faa1f72..28b9301093 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml @@ -1,11 +1,11 @@ -spokenForm: clear quad languageId: java command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] initialState: documentContents: "\"hello\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml index 891e7f29c1..1d41e94deb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: java command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: "\"(hello)\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml index 635077d64c..475e539bce 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: java command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: ("hello") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml index 9fc25e3675..105850b498 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: f"j{fdfhjkd}lkjlkj" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml index b1f4f08739..9451491234 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: | def fff(x, y): diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml index c365c6700d..33156b20b0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: |- """fds diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml index 63d4fcc794..daacdd38c7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: "{1: [(1), (2), (3)]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml index 251f25307d..c3ca4de4b9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: | class a(object): diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml index 438b082f17..6864acbf58 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml @@ -1,11 +1,11 @@ -spokenForm: clear curly languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear curly + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: "{1: [(1), (2), (3)]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml index 6ba122bebd..419284ce27 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml @@ -1,11 +1,11 @@ -spokenForm: clear curly languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear curly + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: curlyBrackets} - extraArgs: [] initialState: documentContents: |- """ diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml index 6311c39683..bd5048a23c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: | class a(object): diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml index cd16c8ab47..3989d85ccf 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml index 87140b0592..0415c3db2f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: |- diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml index 204c20b957..5dab98ec9d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: | a[222] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml index a763c885ae..18736dfddf 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: | a[222] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml index 15c3c8975a..e87eb08adc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: | a[222] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml index 3df522a1f7..dc9495b402 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: f"j{fdfhjkd}lkjlkj" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml index c77cbe6015..e00b32da66 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: f"j{fdfhjkd}lkjlkj" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml index 649bc98898..cb538873ca 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: f"j{fdfhjkd}lkjlkj" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml index 1a39605fa6..532ba41a61 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: | def fff(x, y): diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml index 891dad7b7e..c034896041 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: |- """fds diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml index bc0ac6fe84..3d8b4d3f27 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: f"Hello, {name + 's'}!" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml index 32d6825715..d12afdf369 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: f"Hello, {name + 's'}!" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml index 3fd68ec27b..3d12731dc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: "{1: [(1), (2), (3)]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml index 3fd68ec27b..3d12731dc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: "{1: [(1), (2), (3)]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml index 418600a61e..c47bd39b9c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: f"j{fdfhjkd}lkjlkj" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml index 613ca3bd5d..470759effa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: | def fff(x, y): diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml index fa3ede7c99..4ae35f1cc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair curly languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair curly + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: "{1: [(1), (2), (3)]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml index 32e9952af8..75e9584b3e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml @@ -1,11 +1,11 @@ -spokenForm: clear quad languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] initialState: documentContents: |- """ diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml index 813d184224..4992666f15 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml @@ -1,11 +1,11 @@ -spokenForm: clear quad languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] initialState: documentContents: f"Hello, {name}!" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml index aa3b17e521..4459970cd5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: | class a(object): diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml index 18e4780efc..28ff5ac6fe 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: "'(hello)'" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml index 278717056f..7e6155f596 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: "\"(hello)\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml index cb5dc9d966..3b051e3394 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: f"(hello)" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml index 5d8ecd9e18..a7944a6486 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml @@ -1,11 +1,11 @@ -spokenForm: clear square languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: | a[222] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml index bf12d5390a..102d978f01 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml @@ -1,11 +1,11 @@ -spokenForm: clear square languageId: python command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: "{1: [(1), (2), (3)]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml index eeaaf6c536..967566c395 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml @@ -1,11 +1,11 @@ -spokenForm: clear curly languageId: shellscript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear curly + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: curlyBrackets} - extraArgs: [] initialState: documentContents: "\"${hello}\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml index 85ed640710..5db0dc09bb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: shellscript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "\"${hello}\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml index 77d655779a..9b13810ccc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: shellscript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "\"$(hello)\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml index fac84b035e..585e537b01 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml @@ -1,11 +1,11 @@ -spokenForm: clear string languageId: shellscript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear string + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: string} - extraArgs: [] initialState: documentContents: "\"${hello}\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml index 70a9f0cfee..3b50bbd2d7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml index bc07d5bd58..beed540e54 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml index 1a22abf3c6..dfd6bac5e1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml index 3fd00dcd48..90971b9532 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml index caff475737..a51cec4417 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml index c065b4eca1..e20bcd1f26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml index d36bba0b4c..4fa234d260 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml index 16100d53ad..a26d6ddf65 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml index 12444f7f0f..4235aea7d3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml index 0737ebb1dd..72983c5c6b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml index 2becfb085d..0ac33e89ad 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml index 7b7e4c5ff0..3e481fe26c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml index 56ecd2a84d..dea5e88a34 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml index 7e40e3791b..85bb238a42 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml index 0d464a62e7..4fa7f40258 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml index 3b48e1fad4..8f2c074cc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml index c7ab42b12f..aa105c09ab 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml index 1a0ded8ca8..66585aee9b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml index e97dc3356f..23bc074385 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescriptreact command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml index c7698e1f53..fc5a66f7ec 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: "{const [bongo, baz] = [foo, bar]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml index cd8505d6ae..33a029c4d0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml @@ -1,11 +1,11 @@ -spokenForm: clear matching languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear matching + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: "{const [bongo, baz] = [foo, bar]}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml index 4a2903f7e4..1c93d43ea4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml index d76e12086a..2e4fab1066 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml index ca97599b86..f3624cc024 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml index 85c1b03ccf..ad75c768a0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml index f763243a80..1e7177a311 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml index 0262cf84fd..545ff49f29 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml index c30c13ea4e..ecd1698bca 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml index 3035d11672..10a670342c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml index a72d3ec5bf..37438c359a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml index dfc93a0aa3..489400aa09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml index 10a88ba3ee..6a7847711d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[\"hello\", \"world\"]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml index 6f278a4865..1203ed00e4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name + 's'}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml index 3b16d7010c..baa9948079 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name + 's'}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml index c20d857c72..55e2406151 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, \\${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml index 5b18727955..b06df81802 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[\"hello\", \"world\"]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml index f939562374..d995208314 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[\"hello\", \"world\"]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml index e9457d9f72..20f01698dc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[\"hello\", \"world\"]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml index ce8971adae..5188ff14e6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[\"hello\", \"world\"]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml index e1d8051a76..7376c38e68 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml index c3a68d7b08..d06333b514 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: if (foo > 0) {} selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml index f1e7685dc3..77fc38558f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: if (foo > 0) {} selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml index 0c58f77aae..52d6403b99 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: if (foo > 0) {} selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml index b05de070fd..d44c1b6687 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "const {hello} = {hello: \"world\"}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml index c681de463d..7a170ecbdb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "const {hello} = {hello: \"world\"}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml index 6de20d54ed..afcd8a2173 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "const {hello} = {hello: \"world\"}" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml index 9d739d40a2..c7127fa92c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: () => {return 0;} selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml index 8161b17ae4..8b08e749e1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml @@ -1,11 +1,11 @@ -spokenForm: clear quad languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] initialState: documentContents: // "(hello)" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml index e8cea221bd..a4865618fd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: "\"(hello)\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml index 4fe73a315f..9064aa2745 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: // "(hello)" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml index 74c6451b5b..1d55976c3a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: "'(hello)'" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml index c219484500..df7ff4f261 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml @@ -1,11 +1,11 @@ -spokenForm: clear skis languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear skis + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: backtickQuotes} - extraArgs: [] initialState: documentContents: "`Hello, ${name}!`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml index ea6bb5933d..93b368dd8f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml @@ -1,11 +1,11 @@ -spokenForm: clear square languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: const [bongo, baz] = [foo, bar] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml index 78350f0da9..ba95ab6d97 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml @@ -1,11 +1,11 @@ -spokenForm: clear square languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: const [bongo, baz] = [foo, bar] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml index b45a1a7306..3cc179f11c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml @@ -1,11 +1,11 @@ -spokenForm: clear square languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: const [bongo, baz] = [foo, bar] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml index 4659857231..4a1a9f1d26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml @@ -1,12 +1,12 @@ -spokenForm: clear square lack languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square lack + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly} mark: {type: decoratedSymbol, symbolColor: default, character: '['} - extraArgs: [] initialState: documentContents: const [bongo, baz] = [foo, bar] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml index a23fb6ca90..da5e3b8d1f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml @@ -1,12 +1,12 @@ -spokenForm: clear square rack languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square rack + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly} mark: {type: decoratedSymbol, symbolColor: default, character: ']'} - extraArgs: [] initialState: documentContents: const [bongo, baz] = [foo, bar] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml index 2969c89933..f46b174aac 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml @@ -1,11 +1,11 @@ -spokenForm: clear string languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear string + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: string} - extraArgs: [] initialState: documentContents: "\"(hello)\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml index 9fba5d904b..c0eddc0c2c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml @@ -1,11 +1,11 @@ -spokenForm: clear string languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear string + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: string} - extraArgs: [] initialState: documentContents: "'(hello)'" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml index cc2f1ae2a0..4d37c4b716 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml @@ -1,11 +1,11 @@ -spokenForm: clear string languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear string + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: string} - extraArgs: [] initialState: documentContents: "`(hello)`" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml index 8b6fbd52a0..1f0ddcd6f2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml @@ -1,11 +1,11 @@ -spokenForm: chuck inside round languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck inside round + action: remove + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml index 8ba6ec7857..42ef759958 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml @@ -1,11 +1,11 @@ -spokenForm: chuck pair round languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck pair round + action: remove + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml index 7574357495..a95ee19e62 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml @@ -1,11 +1,11 @@ -spokenForm: chuck round languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck round + action: remove + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml index 7eed02dc97..918ba60b33 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml @@ -1,11 +1,11 @@ -spokenForm: clear curly languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear curly + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: curlyBrackets} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml index d070d05ebf..97b15a2052 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml @@ -1,12 +1,12 @@ -spokenForm: clear outside blue double languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside blue double + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - mark: {type: decoratedSymbol, symbolColor: blue, character: '"', usePrePhraseSnapshot: true} - extraArgs: [] + mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml index 2bdaff264a..ca60437bd7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: |- (hello) diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml index c77a4076cd..28e51421d3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml @@ -1,12 +1,11 @@ -spokenForm: clear inside round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear inside round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml index 41e107c111..bed3a51292 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml @@ -1,12 +1,11 @@ -spokenForm: clear inside round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear inside round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml index b8c6660ff3..6df4e66336 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml index 9dbbde1788..a983169584 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml index af6ac8ead6..fd21798bc0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml index 61e8ca3aff..fb650a9470 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml index ddeef336c7..c7618d48be 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml index f370ed50b4..d0466837e9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml index bd672c2062..079a7f83fe 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml index ecd80bb21f..a41e3cd8fb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[ ( ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml index 3399f60016..d695c935b7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ ( ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml index 8ca3729ee1..132b5626af 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ ( } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml index 80cc14c1a3..0cabbd18bd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: ([]) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml index 5ce56cdfb5..335c1f5c49 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[ { ( { } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml index 8fd6b6251a..9691fa4683 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ [ ( { } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml index 07f60312a7..488a2d80e7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ [ ( } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml index ac9fafb8ae..213326d142 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{[ ( } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml index 6cb759aba4..401181bb6c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ([)] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml index f39474f703..451fa59f34 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ([)] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml index 6ec70f5ac1..d6131e01a1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml index a8ca6926b8..f07ef77524 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml index 5fbc730276..56540cfc1e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml index 40ca934bd0..8fc3a0dbe7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml index 2db3f5a1bc..bb58ce3e09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml index 1b68f09570..4746860dd1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello) (whatever)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml index a2e37347f5..2b928f4846 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello) (whatever)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml index 20421036ac..6660b0198a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[hello (whatever)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml index abdc40a415..e14c271b0a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml @@ -1,16 +1,12 @@ -spokenForm: clear outside leper languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside leper + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] -marks: - default.(: - start: {line: 0, character: 1} - end: {line: 0, character: 2} initialState: documentContents: | [(hello) (whatever)] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml index 0a399a6793..f9e53967aa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml @@ -1,16 +1,12 @@ -spokenForm: clear outside rack languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside rack + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: ']'} - extraArgs: [] -marks: - default.]: - start: {line: 0, character: 20} - end: {line: 0, character: 21} initialState: documentContents: | [(hello) (whatever)] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml index 927c99e0cd..a0666f2473 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml @@ -1,16 +1,12 @@ -spokenForm: clear pair double languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair double + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - extraArgs: [] -marks: - default.": - start: {line: 0, character: 1} - end: {line: 0, character: 2} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml index 6c39eff573..3ca43746f8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml @@ -1,12 +1,11 @@ -spokenForm: clear pair round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml index d59434fab7..41102831e0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml @@ -1,12 +1,11 @@ -spokenForm: clear pair round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml index 0d256390a6..14f559a94d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml index 42810421dc..f103092de5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml index 68204e8deb..b179f57441 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml index b1c6852874..8b726646dd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"()\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml index 70ad219c40..0d7e55fc87 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"hello\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml index 6447c6563b..bc7664ab36 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\\\"\\\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml index 2d666a52ba..023e64fc1e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml index 65d337e5a1..4f4950a337 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml index d274853a83..33767f31c9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml index 213df0b2cb..22f78e5bfe 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml index c098e2364d..54527cc6c5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello) () ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml index 84b7e5d9e9..9a137d39ac 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello) () ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml index 7cd93cd172..0bcb255e6e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello) [] ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml index 4ac9d66b5c..37312750cd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ()() selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml index fa245fd548..7d01e4e4f3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ()( selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml index 5d406839b4..56ed9bddfd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (\(hello\)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml index a56096f56c..bcb1755059 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml index f9e8bd1bf8..153515030e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml index 0adf87ee87..071c32b10a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello (whatever)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml index a96f6fa161..818a0cc70a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello () ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml index 0548d24dd1..08011258df 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello () (whatever)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml index 3e8a6765bc..0936e33a1f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (\(hello\)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml index 7ad616b9f4..4e611c9846 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml index 9c3d2ab459..76a2f3a3ed 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml index 45bd5e26d2..efec6d8b39 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml index b48b230239..57b54951d7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml index e8e4c69008..d938faf170 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (()) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml index 1aeda6c3f9..1a852759ed 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (()) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml index f87d7c147d..0213d51f31 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (()) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml index c4ddc3dbd3..2c908271c2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml @@ -1,16 +1,12 @@ -spokenForm: clear round leper languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round leper + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] -marks: - default.(: - start: {line: 0, character: 0} - end: {line: 0, character: 1} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml index 3242027a71..716a9cdbe5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml @@ -1,16 +1,12 @@ -spokenForm: clear round repper languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round repper + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: )} - extraArgs: [] -marks: - default.): - start: {line: 0, character: 6} - end: {line: 0, character: 7} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml index bb72f6df5e..e6aee441a3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml @@ -1,12 +1,11 @@ -spokenForm: clear square languageId: typescript command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml index 7323ebd36a..ab0e86d8a3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml @@ -1,11 +1,11 @@ -spokenForm: chuck inside round languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck inside round + action: remove + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml index 04c691aba6..d0faf26a1e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml @@ -1,11 +1,11 @@ -spokenForm: chuck pair round languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck pair round + action: remove + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml index 1d345b6f3b..07e8c0ad27 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml @@ -1,11 +1,11 @@ -spokenForm: chuck round languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck round + action: remove + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml index f8e6762fe4..3175ba91ef 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml @@ -1,11 +1,11 @@ -spokenForm: clear curly languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear curly + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: curlyBrackets} - extraArgs: [] initialState: documentContents: |- { diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml index 0804a4228f..32e141a379 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml @@ -1,12 +1,12 @@ -spokenForm: clear outside blue double languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside blue double + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - mark: {type: decoratedSymbol, symbolColor: blue, character: '"', usePrePhraseSnapshot: true} - extraArgs: [] + mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml index 16ed085371..52a34508c0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml index 8986a6b0a9..353e06bd09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml index 5755fdc975..77e8de2243 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml index 87f2d40b76..0e6a5ca7f6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml index 6bb3a86f03..5455441b7f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ('"hello", "world"') selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml index 5354436abf..27e873c9d1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: |- " diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml index e28c69137c..0f5b296b13 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml index 0392e38ba7..2d6eb2d8fd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml index 4636e719e6..ccd4fe3e22 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml index 5813bbbb14..e610274263 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml index 1a714dde66..2273802881 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml index 3aa30498db..dfc3eaa164 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml index f88e983626..5b24523f5b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml index 81d8bd58ff..deb455624c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml @@ -1,11 +1,11 @@ -spokenForm: clear pair languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ("hello", "world") selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml index 5735186c9f..e3a39b8d10 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: |- ( diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml index a0d3360909..d2b4ebf768 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml @@ -1,11 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] initialState: documentContents: |- (hello) diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml index 3a23f8edbe..4c4b8c9d3c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml @@ -1,11 +1,11 @@ -spokenForm: clear string languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear string + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: string} - extraArgs: [] initialState: documentContents: "\"(hello)\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml index 517c75b94c..e099de8e3c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml @@ -1,12 +1,11 @@ -spokenForm: clear escaped quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear escaped quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: \"\" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml index 685471d9de..bd204386e9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml @@ -1,12 +1,11 @@ -spokenForm: clear escaped quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear escaped quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: \"\" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml index dd3e4bc770..a1adfba200 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml @@ -1,12 +1,11 @@ -spokenForm: clear escaped quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear escaped quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: \"\" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml index a6017fac51..fa31fc0101 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml @@ -1,12 +1,11 @@ -spokenForm: clear escaped quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear escaped quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: \"\" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml index a185e53c15..a14e26c920 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml @@ -1,12 +1,11 @@ -spokenForm: clear escaped quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear escaped quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: \"\" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml index 28bbb0c9e1..b0fb0e1121 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml @@ -1,12 +1,11 @@ -spokenForm: clear escaped quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear escaped quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: \"hello\" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml index 8eb6ba57da..35d5905a38 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml @@ -1,12 +1,11 @@ -spokenForm: clear inside round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear inside round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml index 62f795a77f..81bb24536e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml @@ -1,12 +1,11 @@ -spokenForm: clear inside round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear inside round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml index 514af0f3d6..b6a9fd3344 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml @@ -1,11 +1,11 @@ -spokenForm: take left quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take left quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml index a192bfec69..d60fb7d4df 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml @@ -1,11 +1,11 @@ -spokenForm: take left quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take left quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml index 5578299157..bc1b9233fd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml @@ -1,11 +1,11 @@ -spokenForm: take left quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take left quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml index 06a8baedd0..998b3b570b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml @@ -1,11 +1,11 @@ -spokenForm: take left quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take left quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml index 222e823bb7..7bd2de1948 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml @@ -1,11 +1,11 @@ -spokenForm: take left quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take left quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml index 94bbb06c06..e2f0a5adc1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml @@ -1,11 +1,11 @@ -spokenForm: take left quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take left quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml index 6848804c9e..7f0e7cb02b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml @@ -1,11 +1,11 @@ -spokenForm: take left quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take left quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml index 6567947825..58bc732bbd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml index 62faebb407..90cbe8a285 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: (\(hello\)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml index b3be6e3dd2..4f2f987e37 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml index aec410d0db..d9314b09ae 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml index 546e225bf4..7f0db26e26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml index 669388e290..bb4faae285 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml index b99859377d..79693e9769 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml index 430c86b29a..82e0994f96 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( [ ) ] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml index 1103dcda8c..890843ad43 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[ ( ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml index 2bd5475309..af44b1919e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ ( ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml index 7426872d3a..efecdc8ed7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ ( } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml index 3db8b16a7d..e8d020ba41 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: ([]) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml index c3577508cc..c475ca7bdb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "[ { ( { } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml index 5f5b5a67b4..4571ec40f3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ [ ( { } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml index 3bddc3ea3c..0120f21edd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{ [ ( } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml index 9432ee313f..e5f7235df6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: "{[ ( } ] )" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml index 925716b6dc..cdeb182949 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ([)] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml index 3be3682390..4191685a72 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ([)] selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml index 42fa3c54b7..6acf2f819f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml index 198165e528..4e6f1e4e70 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml @@ -1,11 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml index f7e02528ab..155b48ae2d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml index 52f234902c..9dea1900fa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml index 590bfdbc0b..2c20a1471e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml index bdfa61880f..75a1acd1ee 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml index d57f6db56c..91d430ce87 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello) (whatever)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml index 7ef7b6639a..e179631b08 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello) (whatever)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml index 7a86029e1a..2141c9d008 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml @@ -1,12 +1,11 @@ -spokenForm: clear outside languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] -marks: {} initialState: documentContents: "[hello (whatever)]" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml index dfd36980de..37d8daaac5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml @@ -1,12 +1,12 @@ -spokenForm: clear outside fine languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside fine + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - mark: {type: decoratedSymbol, symbolColor: default, character: f, usePrePhraseSnapshot: true} - extraArgs: [] + mark: {type: decoratedSymbol, symbolColor: default, character: f} initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml index f1ff810f48..c1d9a5ad09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml @@ -1,16 +1,12 @@ -spokenForm: clear outside leper languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside leper + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] -marks: - default.(: - start: {line: 0, character: 1} - end: {line: 0, character: 2} initialState: documentContents: | [(hello) (whatever)] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml index 63414bf702..5f172e9364 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml @@ -1,16 +1,12 @@ -spokenForm: clear outside rack languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside rack + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: ']'} - extraArgs: [] -marks: - default.]: - start: {line: 0, character: 20} - end: {line: 0, character: 21} initialState: documentContents: | [(hello) (whatever)] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml index 460e49bbe9..bc604ac767 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml @@ -1,12 +1,12 @@ -spokenForm: clear outside urge languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear outside urge + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - mark: {type: decoratedSymbol, symbolColor: default, character: u, usePrePhraseSnapshot: true} - extraArgs: [] + mark: {type: decoratedSymbol, symbolColor: default, character: u} initialState: documentContents: ( ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml index 4d3b6907b3..8dbb917122 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml @@ -1,16 +1,12 @@ -spokenForm: clear pair double languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair double + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - extraArgs: [] -marks: - default.": - start: {line: 0, character: 1} - end: {line: 0, character: 2} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml index 80d8a80e29..f04ac868bd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml @@ -1,12 +1,11 @@ -spokenForm: clear pair round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml index 718b4e156f..bc2c5d6d41 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml @@ -1,12 +1,11 @@ -spokenForm: clear pair round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear pair round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml index 72d3ef6dae..dff6ec9201 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml index 47de51d50f..88a051e310 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml index dbc6500965..86dac68a60 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml index 6ef8efab82..d6b3345294 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"()\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml index cf3624fc0b..b75613e3dd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"hello\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml index 40baa13288..ef7c665ad4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml @@ -1,12 +1,11 @@ -spokenForm: clear quad languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear quad + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] -marks: {} initialState: documentContents: "\"\\\"\\\"\"" selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml index c4db72d651..96441d3f50 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml @@ -1,11 +1,11 @@ -spokenForm: take right quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take right quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml index 58be265451..3252c6d299 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml @@ -1,11 +1,11 @@ -spokenForm: take right quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take right quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml index 5742cff419..45c8745b6d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml @@ -1,11 +1,11 @@ -spokenForm: take right quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take right quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml index 573f34bcae..6522e3b5cd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml @@ -1,11 +1,11 @@ -spokenForm: take right quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take right quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml index d7c70a73ba..8502907d6c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml @@ -1,11 +1,11 @@ -spokenForm: take right quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take right quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml index 61645eb81e..e2476bcd8f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml @@ -1,11 +1,11 @@ -spokenForm: take right quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take right quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml index 86effc5466..0a61077329 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml @@ -1,11 +1,11 @@ -spokenForm: take right quad languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take right quad + action: setSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right} - extraArgs: [] initialState: documentContents: |- hello world whatever "testing testing testing diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml index aad17d3f01..c70eee27ae 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml index cb2e052c43..0d1c072b0c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml index 1bf92e8169..1b79a0b9d9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml index 396d7c456e..5887bffee2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml index 7454e8d497..f64db6a130 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello) () ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml index c415f09e10..14e7d8d744 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello) () ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml index 04bc4bfcb1..a8075ee321 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ((hello) [] ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml index ff7a45bde2..cb60f87c5d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ()() selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml index b9c7b040ca..5de40ae4b7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: ()( selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml index 8cc07c6b80..e6234c06d1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (\(hello\)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml index dd67e0c775..d2ae66d467 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml index 4a6157e027..033190a2e3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml index 829410ab9f..2a2d4e7421 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello (whatever)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml index 5c6e45e67b..b0ec3bcfa8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello () ) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml index c09e4ae02e..0cdcee1f58 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello () (whatever)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml index 48b94ff39d..7813a165f6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (\(hello\)) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml index b60a8cc8f9..012d454c0d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml index 1dc989999f..5201f1b5f5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml index 030861b05f..7e4643841c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml index 5ced96766f..d03bc45c15 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: () selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml index 7434a7d6f5..86df5b3b20 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (()) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml index dd7f6380ec..58283aaf73 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (()) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml index bd1451b0c1..c5dd69c527 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml @@ -1,12 +1,11 @@ -spokenForm: clear round languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] -marks: {} initialState: documentContents: (()) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml index 18df0d0b71..70df7a4ddc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml @@ -1,16 +1,12 @@ -spokenForm: clear round leper languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round leper + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] -marks: - default.(: - start: {line: 0, character: 0} - end: {line: 0, character: 1} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml index 70eeb102c7..a45d92d480 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml @@ -1,16 +1,12 @@ -spokenForm: clear round repper languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear round repper + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: )} - extraArgs: [] -marks: - default.): - start: {line: 0, character: 6} - end: {line: 0, character: 7} initialState: documentContents: (hello) selections: diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml index 3e7abe6845..7dfde56606 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml @@ -1,12 +1,11 @@ -spokenForm: clear square languageId: plaintext command: - actionName: clearAndSetSelection - partialTargets: + version: 1 + spokenForm: clear square + action: clearAndSetSelection + targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets} - extraArgs: [] -marks: {} initialState: documentContents: "[(hello)]" selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFine.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFine.yml index 3b6aaf7bc3..2965bd4c19 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFine.yml @@ -1,8 +1,9 @@ -spokenForm: bring fine languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive @@ -11,7 +12,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml index c1b4342f1b..54fbdc1bcc 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml @@ -1,8 +1,9 @@ -spokenForm: bring fine after third car this languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine after third car this + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive @@ -10,7 +11,6 @@ command: modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false} mark: {type: cursor} position: after - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml index 4cce1eb78b..10f6234510 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml @@ -1,14 +1,14 @@ -spokenForm: bring fine after this languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine after this + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: cursor} position: after - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml index f56aec41b6..1267f27294 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml @@ -1,14 +1,14 @@ -spokenForm: bring fine after this languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine after this + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: cursor} position: after - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml index cbabac18d4..bce7f981d2 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml @@ -1,14 +1,14 @@ -spokenForm: bring fine before this languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine before this + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: cursor} position: before - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml index bb7a1b1cc4..238de8daa5 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring fine to first car whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to first car whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml index f6d5ddb242..3b59910134 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml @@ -1,14 +1,14 @@ -spokenForm: bring fine to first two car languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to first two car + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml index 16dbfa2f5e..ceeaa743bd 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring fine to last car whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to last car whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml index da0ad8a41c..f4f492b1b6 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml @@ -1,14 +1,14 @@ -spokenForm: bring fine to last two car languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to last two car + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: -2, active: -1} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml index c10dcc1c84..c5c0db2ff3 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring fine to third car whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to third car whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml index ec1cc47183..39d5ca41cf 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml @@ -1,13 +1,13 @@ -spokenForm: bring fine to whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml index eb970c4039..3add8ef66e 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml @@ -1,13 +1,13 @@ -spokenForm: bring fine to whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml index acfef29899..f121242ed5 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml @@ -1,13 +1,13 @@ -spokenForm: bring fine to whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml index d41f0ed53c..41ed962636 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml @@ -1,13 +1,13 @@ -spokenForm: bring fine to whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml index dfecfb3212..2243819c8f 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml @@ -1,13 +1,13 @@ -spokenForm: bring fine to whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring fine to whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml index a1106add93..f5e20372e8 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring harp to end of whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to end of whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml index c1ad9bb990..d90bbaef2b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml @@ -1,8 +1,9 @@ -spokenForm: bring harp to fourth car whale past second car harp languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to fourth car whale past second car harp + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: range @@ -18,7 +19,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: h} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml index 0fc950a8fc..9f8a97a8c2 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml @@ -1,8 +1,9 @@ -spokenForm: bring harp to second car fine past third car harp languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to second car fine past third car harp + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: range @@ -18,7 +19,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: h} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: foo world whateverspaghetti selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml index ff76d437e5..5cfa8c765f 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring harp to second car fine past third car whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to second car fine past third car whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: range @@ -18,7 +19,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: w} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml index 1c2abb6e72..823a418e11 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml @@ -1,15 +1,15 @@ -spokenForm: bring harp to start of whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring harp to start of whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - type: primitive position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml index bc665c8d97..b53df2619e 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml @@ -1,8 +1,9 @@ -spokenForm: bring whale languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring whale + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - type: primitive @@ -11,7 +12,6 @@ command: position: contents modifier: {type: identity} insideOutsideType: inside - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml index b3f8f33d24..94b44d205b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml @@ -1,14 +1,14 @@ -spokenForm: bring whale after fine languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring whale after fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} position: after - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml index 9622ddcb53..e96ae1b561 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml @@ -1,14 +1,14 @@ -spokenForm: bring whale after this languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring whale after this + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - type: primitive mark: {type: cursor} position: after - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml index 9622ddcb53..e96ae1b561 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml @@ -1,14 +1,14 @@ -spokenForm: bring whale after this languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring whale after this + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - type: primitive mark: {type: cursor} position: after - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml index 2eeeab650d..dbd2c11525 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml @@ -1,14 +1,14 @@ -spokenForm: bring whale before this languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring whale before this + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - type: primitive mark: {type: cursor} position: before - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml index bc603d7395..6447d9784f 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml @@ -1,15 +1,15 @@ -spokenForm: bring whale to end of fine languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring whale to end of fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - type: primitive position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: f} - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml index 9b15e441fe..b8ee10a71c 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml @@ -1,13 +1,13 @@ -spokenForm: bring whale to fine languageId: plaintext command: - actionName: replaceWithTarget - partialTargets: + version: 1 + spokenForm: bring whale to fine + action: replaceWithTarget + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: w} - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: f} - extraArgs: [] initialState: documentContents: foo world selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml index c31aab8059..b446deceb9 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml @@ -1,13 +1,13 @@ -spokenForm: chuck first car whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck first car whale + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml index a3c0348f0a..de36bdade4 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml @@ -1,12 +1,12 @@ -spokenForm: chuck first past second car languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck first past second car + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1, excludeAnchor: false, excludeActive: false} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml index d206be2206..cc09ce9ea5 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml @@ -1,12 +1,12 @@ -spokenForm: chuck fourth past fifth car languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck fourth past fifth car + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 3, active: 4, excludeAnchor: false, excludeActive: false} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml index a782e82d6e..105608b75a 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml @@ -1,13 +1,13 @@ -spokenForm: chuck last car whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck last car whale + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false} mark: {type: decoratedSymbol, symbolColor: default, character: w} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml index 766f84d86d..41592e51b3 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml @@ -1,8 +1,9 @@ -spokenForm: chuck second car fine past third car whale languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck second car fine past third car whale + action: remove + targets: - type: range start: type: primitive @@ -16,7 +17,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: w} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml index 439c75fb52..9d2b6dffe3 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml @@ -1,12 +1,12 @@ -spokenForm: chuck second past third car languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck second past third car + action: remove + targets: - type: primitive selectionType: token modifier: {type: subpiece, pieceType: character, anchor: 1, active: 2, excludeAnchor: false, excludeActive: false} - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml index e4d9454140..f364a01d35 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml @@ -1,8 +1,9 @@ -spokenForm: chuck third car whale past second car harp languageId: plaintext command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck third car whale past second car harp + action: remove + targets: - type: range start: type: primitive @@ -16,7 +17,6 @@ command: mark: {type: decoratedSymbol, symbolColor: default, character: h} excludeStart: false excludeEnd: false - extraArgs: [] initialState: documentContents: foo world whatever selections: diff --git a/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml b/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml index e7edc40c56..9ed8cd4a6b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml @@ -1,11 +1,11 @@ -spokenForm: comment trap languageId: typescript command: - actionName: toggleLineComment - partialTargets: + version: 1 + spokenForm: comment trap + action: toggleLineComment + targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: t} - extraArgs: [] initialState: documentContents: |- 'hello' diff --git a/src/test/suite/fixtures/constants.fixture.ts b/src/test/suite/fixtures/subtoken.fixture.ts similarity index 96% rename from src/test/suite/fixtures/constants.fixture.ts rename to src/test/suite/fixtures/subtoken.fixture.ts index 7e77681501..b9a5d31d94 100644 --- a/src/test/suite/fixtures/constants.fixture.ts +++ b/src/test/suite/fixtures/subtoken.fixture.ts @@ -3,7 +3,7 @@ interface Fixture { expectedOutput: string[]; } -export const subwordFixture: Fixture[] = [ +export const subtokenFixture: Fixture[] = [ { input: "QuickBrownFox", expectedOutput: ["Quick", "Brown", "Fox"], @@ -67,5 +67,5 @@ export const subwordFixture: Fixture[] = [ { input: "mockAPIClient123Factory", expectedOutput: ["mock", "API", "Client", "123", "Factory"], - } + }, ]; diff --git a/src/test/suite/prePhraseSnapshot.test.ts b/src/test/suite/prePhraseSnapshot.test.ts new file mode 100644 index 0000000000..31a58d7c44 --- /dev/null +++ b/src/test/suite/prePhraseSnapshot.test.ts @@ -0,0 +1,97 @@ +import * as assert from "assert"; +import * as vscode from "vscode"; +import * as sinon from "sinon"; +import { getCursorlessApi } from "../../util/getExtensionApi"; +import { selectionToPlainObject } from "../../testUtil/toPlainObject"; +import { mockPrePhraseGetVersion } from "../mockPrePhraseGetVersion"; +import { openNewEditor } from "../openNewEditor"; + +/** + * The selections we expect when the pre-phrase snapshot is used + */ +const snapshotExpectedSelections = [new vscode.Selection(0, 6, 0, 11)]; + +/** + * The selections we expect when the pre-phrase snapshot is not used + */ +const noSnapshotExpectedSelections = [new vscode.Selection(1, 6, 1, 11)]; + +suite("Pre-phrase snapshots", async function () { + this.timeout("100s"); + this.retries(3); + + teardown(() => { + sinon.restore(); + }); + + test("Pre-phrase snapshot; single phrase", () => + runTest(true, false, snapshotExpectedSelections)); + + test("Pre-phrase snapshot; multiple phrase", () => + runTest(true, true, noSnapshotExpectedSelections)); + test("No snapshot; single phrase", () => + runTest(false, false, noSnapshotExpectedSelections)); + test("No snapshot; multiple phrase", () => + runTest(false, true, noSnapshotExpectedSelections)); +}); + +async function runTest( + usePrePhraseSnapshot: boolean, + multiplePhrases: boolean, + expectedSelections: vscode.Selection[] +) { + const graph = (await getCursorlessApi()).graph!; + + const editor = await openNewEditor("Hello world testing whatever"); + + editor.selections = [new vscode.Selection(0, 0, 0, 0)]; + + let prePhraseVersion = "version1"; + mockPrePhraseGetVersion(graph, async () => prePhraseVersion); + + await graph.hatTokenMap.addDecorations(); + prePhraseVersion = "version2"; + + await vscode.commands.executeCommand("cursorless.command", { + version: 1, + spokenForm: "whatever", + action: "replaceWithTarget", + targets: [ + { type: "primitive", selectionType: "line", mark: { type: "cursor" } }, + { + type: "primitive", + mark: { type: "cursor" }, + position: "after", + }, + ], + }); + + await graph.hatTokenMap.addDecorations(); + + if (multiplePhrases) { + // If test is simulating separate phrases, we simulate pre-phrase signal being sent + prePhraseVersion = "version3"; + } + + await vscode.commands.executeCommand("cursorless.command", { + version: 1, + spokenForm: "whatever", + action: "setSelection", + targets: [ + { + type: "primitive", + mark: { + type: "decoratedSymbol", + symbolColor: "default", + character: "o", + }, + }, + ], + usePrePhraseSnapshot, + }); + + assert.deepStrictEqual( + editor.selections.map(selectionToPlainObject), + expectedSelections.map(selectionToPlainObject) + ); +} diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index b9844dbc09..d9e07ade7b 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -5,7 +5,7 @@ import * as path from "path"; import * as yaml from "js-yaml"; import * as vscode from "vscode"; import { TestCaseFixture } from "../../testUtil/TestCase"; -import NavigationMap from "../../core/NavigationMap"; +import HatTokenMap from "../../core/HatTokenMap"; import * as sinon from "sinon"; import { Clipboard } from "../../util/Clipboard"; import { takeSnapshot } from "../../testUtil/takeSnapshot"; @@ -17,14 +17,13 @@ import { SerializedMarks, } from "../../testUtil/toPlainObject"; import { walkFilesSync } from "../../testUtil/walkSync"; -import { - CursorlessApi, - getCursorlessApi, - getParseTreeApi, -} from "../../util/getExtensionApi"; +import { getCursorlessApi } from "../../util/getExtensionApi"; import { enableDebugLog } from "../../util/debug"; import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; import asyncSafety from "./asyncSafety"; +import { ReadOnlyHatMap } from "../../core/IndividualHatMap"; +import { mockPrePhraseGetVersion } from "../mockPrePhraseGetVersion"; +import { openNewEditor } from "../openNewEditor"; function createPosition(position: PositionPlainObject) { return new vscode.Position(position.line, position.character); @@ -64,14 +63,12 @@ async function runTest(file: string) { const excludeFields: string[] = []; const cursorlessApi = await getCursorlessApi(); - const parseTreeApi = await getParseTreeApi(); + const graph = cursorlessApi.graph!; - await vscode.commands.executeCommand("workbench.action.closeAllEditors"); - const document = await vscode.workspace.openTextDocument({ - language: fixture.languageId, - content: fixture.initialState.documentContents, - }); - const editor = await vscode.window.showTextDocument(document); + const editor = await openNewEditor( + fixture.initialState.documentContents, + fixture.languageId + ); if (!fixture.initialState.documentContents.includes("\n")) { await editor.edit((editBuilder) => { @@ -79,8 +76,6 @@ async function runTest(file: string) { }); } - await parseTreeApi.loadLanguage(document.languageId); - editor.selections = fixture.initialState.selections.map(createSelection); if (fixture.initialState.thatMark) { @@ -108,18 +103,16 @@ async function runTest(file: string) { excludeFields.push("clipboard"); } - // Wait for cursorless to set up decorations - cursorlessApi.addDecorations(); + await graph.hatTokenMap.addDecorations(); + + const readableHatMap = await graph.hatTokenMap.getReadableMap(false); // Assert that recorded decorations are present - checkMarks(fixture.initialState.marks, cursorlessApi.navigationMap); + checkMarks(fixture.initialState.marks, readableHatMap); const returnValue = await vscode.commands.executeCommand( "cursorless.command", - fixture.spokenForm, - fixture.command.actionName, - fixture.command.partialTargets, - ...fixture.command.extraArgs + fixture.command ); const marks = @@ -128,7 +121,7 @@ async function runTest(file: string) { : marksToPlainObject( extractTargetedMarks( Object.keys(fixture.finalState.marks) as string[], - cursorlessApi.navigationMap + readableHatMap ) ); @@ -161,15 +154,15 @@ async function runTest(file: string) { function checkMarks( marks: SerializedMarks | undefined, - navigationMap: NavigationMap + hatTokenMap: ReadOnlyHatMap ) { if (marks == null) { return; } Object.entries(marks).forEach(([key, token]) => { - const { hatStyle, character } = NavigationMap.splitKey(key); - const currentToken = navigationMap.getToken(hatStyle, character); + const { hatStyle, character } = HatTokenMap.splitKey(key); + const currentToken = hatTokenMap.getToken(hatStyle, character); assert(currentToken != null, `Mark "${hatStyle} ${character}" not found`); assert.deepStrictEqual(rangeToPlainObject(currentToken.range), token); }); diff --git a/src/test/suite/constants.test.ts b/src/test/suite/subtoken.test.ts similarity index 55% rename from src/test/suite/constants.test.ts rename to src/test/suite/subtoken.test.ts index c40466c0aa..edc2878c6b 100644 --- a/src/test/suite/constants.test.ts +++ b/src/test/suite/subtoken.test.ts @@ -1,10 +1,10 @@ import * as assert from "assert"; import { SUBWORD_MATCHER } from "../../core/constants"; -import { subwordFixture } from "./fixtures/constants.fixture"; +import { subtokenFixture } from "./fixtures/subtoken.fixture"; -suite("subword regex matcher", () => { - subwordFixture.forEach(({ input, expectedOutput }, index) => { +suite("subtoken regex matcher", () => { + subtokenFixture.forEach(({ input, expectedOutput }, index) => { test(input, () => { assert.deepStrictEqual(input.match(SUBWORD_MATCHER), expectedOutput); }); diff --git a/src/test/suite/toggleDecorations.test.ts b/src/test/suite/toggleDecorations.test.ts new file mode 100644 index 0000000000..38173e6afe --- /dev/null +++ b/src/test/suite/toggleDecorations.test.ts @@ -0,0 +1,36 @@ +import * as assert from "assert"; +import * as vscode from "vscode"; +import * as sinon from "sinon"; +import { getCursorlessApi } from "../../util/getExtensionApi"; +import { openNewEditor } from "../openNewEditor"; + +suite("toggle decorations", async function () { + this.timeout("100s"); + this.retries(3); + + teardown(() => { + sinon.restore(); + }); + + test("toggle decorations", () => runTest()); +}); + +async function runTest() { + const { hatTokenMap } = (await getCursorlessApi()).graph!; + + await openNewEditor("Hello world testing whatever"); + + // Check that hats appear by default + await hatTokenMap.addDecorations(); + assert((await hatTokenMap.getReadableMap(false)).getEntries().length !== 0); + + // Check that hats disappear when turned off + await vscode.commands.executeCommand("cursorless.toggleDecorations"); + await hatTokenMap.addDecorations(); + assert((await hatTokenMap.getReadableMap(false)).getEntries().length === 0); + + // Check that hats reappear when turned back on + await vscode.commands.executeCommand("cursorless.toggleDecorations"); + await hatTokenMap.addDecorations(); + assert((await hatTokenMap.getReadableMap(false)).getEntries().length !== 0); +} diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index 5bbe0d169c..7193c61fbc 100644 --- a/src/testUtil/TestCase.ts +++ b/src/testUtil/TestCase.ts @@ -1,5 +1,5 @@ import * as vscode from "vscode"; -import NavigationMap from "../core/NavigationMap"; +import HatTokenMap from "../core/HatTokenMap"; import { ThatMark } from "../core/ThatMark"; import { ActionType, PartialTarget, Target, Token } from "../typings/Types"; import { @@ -10,25 +10,22 @@ import { marksToPlainObject, SerializedMarks } from "./toPlainObject"; import { takeSnapshot, TestCaseSnapshot } from "./takeSnapshot"; import serialize from "./serialize"; import { pick } from "lodash"; +import { ReadOnlyHatMap } from "../core/IndividualHatMap"; +import { CommandArgument } from "../core/commandRunner/types"; +import { cleanUpTestCaseCommand } from "./cleanUpTestCaseCommand"; -export type TestCaseCommand = { - actionName: ActionType; - partialTargets: PartialTarget[]; - extraArgs: any[]; -}; +export type TestCaseCommand = CommandArgument; export type TestCaseContext = { - spokenForm: string; thatMark: ThatMark; sourceMark: ThatMark; targets: Target[]; - navigationMap: NavigationMap; + hatTokenMap: ReadOnlyHatMap; }; export type TestCaseFixture = { - spokenForm: string; - command: TestCaseCommand; languageId: string; + command: TestCaseCommand; /** * A list of marks to check in the case of navigation map test otherwise undefined @@ -43,7 +40,6 @@ export type TestCaseFixture = { }; export class TestCase { - spokenForm: string; languageId: string; fullTargets: Target[]; initialState: TestCaseSnapshot | null = null; @@ -52,36 +48,37 @@ export class TestCase { targetKeys: string[]; private _awaitingFinalMarkInfo: boolean; marksToCheck?: string[]; + public command: TestCaseCommand; constructor( - private command: TestCaseCommand, + command: TestCaseCommand, private context: TestCaseContext, - private isNavigationMapTest: boolean = false + private isHatTokenMapTest: boolean = false ) { const activeEditor = vscode.window.activeTextEditor!; + this.command = cleanUpTestCaseCommand(command); - const { targets, spokenForm } = context; + const { targets } = context; this.targetKeys = targets.map(extractTargetKeys).flat(); - this.spokenForm = spokenForm; this.languageId = activeEditor.document.languageId; this.fullTargets = targets; - this._awaitingFinalMarkInfo = isNavigationMapTest; + this._awaitingFinalMarkInfo = isHatTokenMapTest; } private getMarks() { let marks: Record; - const { navigationMap } = this.context; + const { hatTokenMap } = this.context; - if (this.isNavigationMapTest) { + if (this.isHatTokenMapTest) { // If we're doing a navigation map test, then we grab the entire // navigation map because we'll filter it later based on the marks // referenced in the expected follow up command - marks = Object.fromEntries(navigationMap.getEntries()); + marks = Object.fromEntries(hatTokenMap.getEntries()); } else { - marks = extractTargetedMarks(this.targetKeys, navigationMap); + marks = extractTargetedMarks(this.targetKeys, hatTokenMap); } return marksToPlainObject(marks); @@ -104,7 +101,7 @@ export class TestCase { private getExcludedFields(context?: { initialSnapshot?: boolean }) { const excludableFields = { - clipboard: !["copy", "paste"].includes(this.command.actionName), + clipboard: !["copy", "paste"].includes(this.command.action), thatMark: context?.initialSnapshot && !this.fullTargets.some((target) => @@ -121,7 +118,7 @@ export class TestCase { "scrollToBottom", "scrollToCenter", "scrollToTop", - ].includes(this.command.actionName), + ].includes(this.command.action), }; return Object.keys(excludableFields).filter( @@ -134,7 +131,6 @@ export class TestCase { throw Error("Two snapshots must be taken before serializing"); } const fixture: TestCaseFixture = { - spokenForm: this.spokenForm, languageId: this.languageId, command: this.command, marksToCheck: this.marksToCheck, @@ -163,7 +159,7 @@ export class TestCase { this.context.thatMark, this.context.sourceMark, excludeFields, - this.isNavigationMapTest ? this.getMarks() : undefined + this.isHatTokenMapTest ? this.getMarks() : undefined ); } diff --git a/src/testUtil/TestCaseRecorder.ts b/src/testUtil/TestCaseRecorder.ts index 51b8403f95..7aa2723716 100644 --- a/src/testUtil/TestCaseRecorder.ts +++ b/src/testUtil/TestCaseRecorder.ts @@ -12,7 +12,7 @@ export class TestCaseRecorder { fixtureRoot: string | null; fixtureSubdirectory: string | null = null; testCase: TestCase | null = null; - isNavigationMapTest: boolean = false; + isHatTokenMapTest: boolean = false; constructor(extensionContext: vscode.ExtensionContext) { this.workspacePath = @@ -29,10 +29,10 @@ export class TestCaseRecorder { : null; } - async start(isNavigationMapTest: boolean = false): Promise { + async start(isHatTokenMapTest: boolean = false): Promise { this.active = await this.promptSubdirectory(); if (this.active) { - this.isNavigationMapTest = isNavigationMapTest; + this.isHatTokenMapTest = isHatTokenMapTest; } return this.active; } @@ -54,7 +54,7 @@ export class TestCaseRecorder { await this.finishTestCase(); } else { // Otherwise, we are starting a new test case - this.testCase = new TestCase(command, context, this.isNavigationMapTest); + this.testCase = new TestCase(command, context, this.isHatTokenMapTest); await this.testCase.recordInitialState(); } } @@ -154,10 +154,10 @@ export class TestCaseRecorder { ); if (!fs.existsSync(targetDirectory)) { - fs.mkdirSync(targetDirectory); + fs.mkdirSync(targetDirectory, { recursive: true }); } - let filename = camelize(testCase.spokenForm); + let filename = camelize(testCase.command.spokenForm!); let filePath = path.join(targetDirectory, `${filename}.yml`); let i = 2; diff --git a/src/testUtil/cleanUpTestCaseCommand.ts b/src/testUtil/cleanUpTestCaseCommand.ts new file mode 100644 index 0000000000..c1822abba2 --- /dev/null +++ b/src/testUtil/cleanUpTestCaseCommand.ts @@ -0,0 +1,17 @@ +import { TestCaseCommand } from "./TestCase"; + +export function cleanUpTestCaseCommand( + command: TestCaseCommand +): TestCaseCommand { + const { extraArgs, usePrePhraseSnapshot, ...rest } = command; + + return { + ...rest, + extraArgs: + extraArgs == null + ? undefined + : extraArgs.length === 0 + ? undefined + : extraArgs, + }; +} diff --git a/src/testUtil/extractTargetedMarks.ts b/src/testUtil/extractTargetedMarks.ts index 2a7fad2b90..4288422124 100644 --- a/src/testUtil/extractTargetedMarks.ts +++ b/src/testUtil/extractTargetedMarks.ts @@ -1,5 +1,6 @@ import { HatStyleName } from "../core/constants"; -import NavigationMap from "../core/NavigationMap"; +import { ReadOnlyHatMap } from "../core/IndividualHatMap"; +import HatTokenMap from "../core/HatTokenMap"; import { PrimitiveTarget, Target, Token } from "../typings/Types"; function extractPrimitiveTargetKeys(...targets: PrimitiveTarget[]) { @@ -7,7 +8,7 @@ function extractPrimitiveTargetKeys(...targets: PrimitiveTarget[]) { targets.forEach((target) => { if (target.mark.type === "decoratedSymbol") { const { character, symbolColor } = target.mark; - keys.push(NavigationMap.getKey(symbolColor, character)); + keys.push(HatTokenMap.getKey(symbolColor, character)); } }); return keys; @@ -31,13 +32,13 @@ export function extractTargetKeys(target: Target): string[] { export function extractTargetedMarks( targetKeys: string[], - navigationMap: NavigationMap + hatTokenMap: ReadOnlyHatMap ) { const targetedMarks: { [decoratedCharacter: string]: Token } = {}; targetKeys.forEach((key) => { - const { hatStyle, character } = NavigationMap.splitKey(key); - targetedMarks[key] = navigationMap.getToken(hatStyle, character); + const { hatStyle, character } = HatTokenMap.splitKey(key); + targetedMarks[key] = hatTokenMap.getToken(hatStyle, character); }); return targetedMarks; diff --git a/src/testUtil/isTesting.ts b/src/testUtil/isTesting.ts new file mode 100644 index 0000000000..2c0cf4a148 --- /dev/null +++ b/src/testUtil/isTesting.ts @@ -0,0 +1,3 @@ +const isTesting = () => process.env.CURSORLESS_TEST != null; + +export default isTesting; diff --git a/src/typings/Types.ts b/src/typings/Types.ts index 4182b62f91..deea857001 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -3,12 +3,14 @@ import * as vscode from "vscode"; import { ExtensionContext, Location, Selection } from "vscode"; import { HatStyleName } from "../core/constants"; import { EditStyles } from "../core/editStyles"; -import NavigationMap from "../core/NavigationMap"; +import HatTokenMap from "../core/HatTokenMap"; import { Snippets } from "../core/Snippets"; import { RangeUpdater } from "../core/updateSelections/RangeUpdater"; import { FullRangeInfo } from "./updateSelections"; import Decorations from "../core/Decorations"; import FontMeasurements from "../core/FontMeasurements"; +import { CommandServerApi } from "../util/getExtensionApi"; +import { ReadOnlyHatMap } from "../core/IndividualHatMap"; /** * A token within a text editor, including the current display line of the token @@ -232,7 +234,7 @@ export type Target = PrimitiveTarget | RangeTarget | ListTarget; export interface ProcessedTargetsContext { currentSelections: SelectionWithEditor[]; currentEditor: vscode.TextEditor | undefined; - navigationMap: NavigationMap; + hatTokenMap: ReadOnlyHatMap; thatMark: SelectionWithEditor[]; sourceMark: SelectionWithEditor[]; getNodeAtLocation: (location: Location) => SyntaxNode; @@ -367,9 +369,9 @@ export interface Graph { readonly editStyles: EditStyles; /** - * Keeps a map of all decorated marks + * Maps from (hatStyle, character) pairs to tokens */ - readonly navigationMap: NavigationMap; + readonly hatTokenMap: HatTokenMap; /** * The extension context passed in during extension activation @@ -397,6 +399,11 @@ export interface Graph { * Takes measurements of the user's font */ readonly fontMeasurements: FontMeasurements; + + /** + * API object for interacting with the command server, if it exists + */ + readonly commandServerApi: CommandServerApi | null; } export type NodeMatcherValue = { diff --git a/src/util/addDecorationsToEditor.ts b/src/util/addDecorationsToEditor.ts index 413a68541b..c5478f7963 100644 --- a/src/util/addDecorationsToEditor.ts +++ b/src/util/addDecorationsToEditor.ts @@ -6,8 +6,8 @@ import { getTokensInRange } from "./getTokensInRange"; import { Token } from "../typings/Types"; import Decorations from "../core/Decorations"; import { HatStyleName } from "../core/constants"; -import NavigationMap from "../core/NavigationMap"; import { TOKEN_MATCHER } from "../core/tokenizer"; +import { IndividualHatMap } from "../core/IndividualHatMap"; interface CharacterTokenInfo { characterIdx: number; @@ -15,10 +15,10 @@ interface CharacterTokenInfo { } export function addDecorationsToEditors( - navigationMap: NavigationMap, + hatTokenMap: IndividualHatMap, decorations: Decorations ) { - navigationMap.clear(); + hatTokenMap.clear(); var editors: vscode.TextEditor[]; @@ -152,7 +152,7 @@ export function addDecorationsToEditors( ) ); - navigationMap.addToken(hatStyleName, bestCharacter.character, token); + hatTokenMap.addToken(hatStyleName, bestCharacter.character, token); characterDecorationIndices[bestCharacter.character] = currentDecorationIndex + 1; diff --git a/src/util/bigint.ts b/src/util/bigint.ts new file mode 100644 index 0000000000..712b3742b4 --- /dev/null +++ b/src/util/bigint.ts @@ -0,0 +1,4 @@ +// From https://stackoverflow.com/a/64953280 +export function abs(x: bigint) { + return x < BigInt(0) ? -x : x; +} diff --git a/src/util/canonicalizeAndValidateCommand.ts b/src/util/canonicalizeAndValidateCommand.ts index 9efeb901eb..311fb4bb17 100644 --- a/src/util/canonicalizeAndValidateCommand.ts +++ b/src/util/canonicalizeAndValidateCommand.ts @@ -1,13 +1,30 @@ import canonicalizeActionName from "./canonicalizeActionName"; import canonicalizeTargets from "./canonicalizeTargets"; import { ActionType, PartialTarget, SelectionType } from "../typings/Types"; -import { getPrimitiveTargets } from "./getPrimitiveTargets"; +import { getPartialPrimitiveTargets } from "./getPrimitiveTargets"; +import { + CommandArgument, + CommandArgumentComplete, +} from "../core/commandRunner/types"; +/** + * Given a command argument which comes from the client, normalize it so that it + * conforms to the latest version of the expected cursorless command argument. + * + * @param commandArgument The command argument to normalize + * @returns The normalized command argument + */ export function canonicalizeAndValidateCommand( - inputActionName: string, - inputPartialTargets: PartialTarget[], - inputExtraArgs: any[] -) { + commandArgument: CommandArgument +): CommandArgumentComplete { + const { + action: inputActionName, + targets: inputPartialTargets, + extraArgs: inputExtraArgs = [], + usePrePhraseSnapshot = false, + ...rest + } = commandArgument; + const actionName = canonicalizeActionName(inputActionName); const partialTargets = canonicalizeTargets(inputPartialTargets); const extraArgs = inputExtraArgs; @@ -15,9 +32,12 @@ export function canonicalizeAndValidateCommand( validateCommand(actionName, partialTargets, extraArgs); return { - actionName, - partialTargets, - extraArgs, + ...rest, + version: 1, + action: actionName, + targets: partialTargets, + extraArgs: extraArgs, + usePrePhraseSnapshot, }; } @@ -40,7 +60,7 @@ function usesSelectionType( selectionType: SelectionType, partialTargets: PartialTarget[] ) { - return getPrimitiveTargets(partialTargets).some( + return getPartialPrimitiveTargets(partialTargets).some( (partialTarget) => partialTarget.selectionType === selectionType ); } diff --git a/src/util/canonicalizeTargets.ts b/src/util/canonicalizeTargets.ts index 9470fed17a..6ce1810ee4 100755 --- a/src/util/canonicalizeTargets.ts +++ b/src/util/canonicalizeTargets.ts @@ -4,7 +4,7 @@ import { ScopeType, } from "../typings/Types"; import update from "immutability-helper"; -import { transformPrimitiveTargets } from "./getPrimitiveTargets"; +import { transformPartialPrimitiveTargets } from "./getPrimitiveTargets"; import { HatStyleName } from "../core/constants"; import { flow } from "lodash"; @@ -43,7 +43,7 @@ const canonicalizeColors = ( : target; export default function canonicalizeTargets(partialTargets: PartialTarget[]) { - return transformPrimitiveTargets( + return transformPartialPrimitiveTargets( partialTargets, flow(canonicalizeScopeTypes, canonicalizeColors) ); diff --git a/src/util/editDisplayUtils.ts b/src/util/editDisplayUtils.ts index 4dc3f888a4..ef55105d5e 100644 --- a/src/util/editDisplayUtils.ts +++ b/src/util/editDisplayUtils.ts @@ -4,6 +4,7 @@ import { isLineSelectionType } from "./selectionType"; import { promisify } from "util"; import { runOnTargetsForEachEditor, runForEachEditor } from "./targetUtils"; import { EditStyle } from "../core/editStyles"; +import isTesting from "../testUtil/isTesting"; const sleep = promisify(setTimeout); @@ -13,7 +14,7 @@ const getPendingEditDecorationTime = () => .get("pendingEditDecorationTime")!; export async function decorationSleep() { - if (process.env.CURSORLESS_TEST != null) { + if (isTesting()) { return; } diff --git a/src/util/getExtensionApi.ts b/src/util/getExtensionApi.ts index 4cf4cc9fb8..f2aea6d43e 100644 --- a/src/util/getExtensionApi.ts +++ b/src/util/getExtensionApi.ts @@ -1,13 +1,16 @@ import * as vscode from "vscode"; import { ThatMark } from "../core/ThatMark"; -import NavigationMap from "../core/NavigationMap"; import { SyntaxNode } from "web-tree-sitter"; +import { Graph } from "../typings/Types"; export interface CursorlessApi { thatMark: ThatMark; sourceMark: ThatMark; - navigationMap: NavigationMap; - addDecorations: () => void; + + /** + * The dependency injection graph object used by cursorless. Only exposed during testing + */ + graph?: Graph; } export interface ParseTreeApi { @@ -15,9 +18,25 @@ export interface ParseTreeApi { loadLanguage: (languageId: string) => Promise; } +export interface InboundSignal { + getVersion(): Promise; +} + +export interface CommandServerApi { + signals: { + prePhrase: InboundSignal; + }; +} + export async function getExtensionApi(extensionId: string) { const extension = vscode.extensions.getExtension(extensionId); + return extension == null ? null : ((await extension.activate()) as T); +} + +export async function getExtensionApiStrict(extensionId: string) { + const extension = vscode.extensions.getExtension(extensionId); + if (extension == null) { throw new Error(`Could not get ${extensionId} extension`); } @@ -26,7 +45,14 @@ export async function getExtensionApi(extensionId: string) { } export const getCursorlessApi = () => - getExtensionApi("pokey.cursorless"); + getExtensionApiStrict("pokey.cursorless"); export const getParseTreeApi = () => - getExtensionApi("pokey.parse-tree"); + getExtensionApiStrict("pokey.parse-tree"); + +/** + * + * @returns Command server API or null if not installed + */ +export const getCommandServerApi = () => + getExtensionApi("pokey.command-server"); diff --git a/src/util/getPrimitiveTargets.ts b/src/util/getPrimitiveTargets.ts index c6abf09d93..8206390edf 100644 --- a/src/util/getPrimitiveTargets.ts +++ b/src/util/getPrimitiveTargets.ts @@ -2,6 +2,8 @@ import { PartialPrimitiveTarget, PartialRangeTarget, PartialTarget, + PrimitiveTarget, + Target, } from "../typings/Types"; /** @@ -11,22 +13,44 @@ import { * @param targets The targets to extract from * @returns A list of primitive targets */ - -export function getPrimitiveTargets(targets: PartialTarget[]) { - return targets.flatMap(getPrimitiveTargetsHelper); +export function getPartialPrimitiveTargets(targets: PartialTarget[]) { + return targets.flatMap(getPartialPrimitiveTargetsHelper); } -function getPrimitiveTargetsHelper( + +function getPartialPrimitiveTargetsHelper( target: PartialTarget ): PartialPrimitiveTarget[] { switch (target.type) { case "primitive": return [target]; case "list": - return target.elements.flatMap(getPrimitiveTargetsHelper); + return target.elements.flatMap(getPartialPrimitiveTargetsHelper); case "range": return [target.start, target.end]; } } +/** + * Given a list of targets, recursively descends all targets and returns every + * contained primitive target. + * + * @param targets The targets to extract from + * @returns A list of primitive targets + */ +export function getPrimitiveTargets(targets: Target[]) { + return targets.flatMap(getPrimitiveTargetsHelper); +} + +function getPrimitiveTargetsHelper(target: Target): PrimitiveTarget[] { + switch (target.type) { + case "primitive": + return [target]; + case "list": + return target.elements.flatMap(getPrimitiveTargetsHelper); + case "range": + return [target.anchor, target.active]; + } +} + /** * Given a list of targets, recursively descends all targets and applies `func` * to every primitive target. @@ -34,14 +58,16 @@ function getPrimitiveTargetsHelper( * @param targets The targets to extract from * @returns A list of primitive targets */ - -export function transformPrimitiveTargets( +export function transformPartialPrimitiveTargets( targets: PartialTarget[], func: (target: PartialPrimitiveTarget) => PartialPrimitiveTarget ) { - return targets.map((target) => transformPrimitiveTargetsHelper(target, func)); + return targets.map((target) => + transformPartialPrimitiveTargetsHelper(target, func) + ); } -function transformPrimitiveTargetsHelper( + +function transformPartialPrimitiveTargetsHelper( target: PartialTarget, func: (target: PartialPrimitiveTarget) => PartialPrimitiveTarget ): PartialTarget { @@ -53,7 +79,7 @@ function transformPrimitiveTargetsHelper( ...target, elements: target.elements.map( (element) => - transformPrimitiveTargetsHelper(element, func) as + transformPartialPrimitiveTargetsHelper(element, func) as | PartialPrimitiveTarget | PartialRangeTarget ), diff --git a/src/util/graphFactories.ts b/src/util/graphFactories.ts index 749ee71536..59aea95219 100644 --- a/src/util/graphFactories.ts +++ b/src/util/graphFactories.ts @@ -2,7 +2,7 @@ import Actions from "../actions"; import { EditStyles } from "../core/editStyles"; import { Graph } from "../typings/Types"; import { FactoryMap } from "./makeGraph"; -import NavigationMap from "../core/NavigationMap"; +import HatTokenMap from "../core/HatTokenMap"; import { Snippets } from "../core/Snippets"; import { RangeUpdater } from "../core/updateSelections/RangeUpdater"; import Decorations from "../core/Decorations"; @@ -15,7 +15,7 @@ type ConstructorMap = { const graphConstructors: Partial> = { actions: Actions, editStyles: EditStyles, - navigationMap: NavigationMap, + hatTokenMap: HatTokenMap, decorations: Decorations, fontMeasurements: FontMeasurements, snippets: Snippets, diff --git a/src/util/makeGraph.ts b/src/util/makeGraph.ts index 202845b9aa..fc0a878304 100644 --- a/src/util/makeGraph.ts +++ b/src/util/makeGraph.ts @@ -1,3 +1,5 @@ +import isTesting from "../testUtil/isTesting"; + export type FactoryMap = { [P in keyof T]: (t: T) => T[P]; }; @@ -37,6 +39,9 @@ export default function makeGraph( factoryMap, key as keyof GraphType ), + + // NB: If we're testing, we make property mutable to allow mocking + configurable: isTesting(), }); }); diff --git a/src/util/type.ts b/src/util/type.ts new file mode 100644 index 0000000000..657c047376 --- /dev/null +++ b/src/util/type.ts @@ -0,0 +1,3 @@ +export function isString(arg: unknown): arg is string { + return typeof arg === "string" || arg instanceof String; +} diff --git a/yarn.lock b/yarn.lock index 51a863035f..99bc1631a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -143,10 +143,10 @@ dependencies: "@sinonjs/fake-timers" "^7.1.0" -"@types/vscode@^1.53.0": - version "1.53.0" - resolved "https://registry.npmjs.org/@types/vscode/-/vscode-1.53.0.tgz" - integrity sha512-XjFWbSPOM0EKIT2XhhYm3D3cx3nn3lshMUcWNy1eqefk+oqRuBq8unVb6BYIZqXy9lQZyeUl7eaBCOZWv+LcXQ== +"@types/vscode@^1.61.0": + version "1.61.0" + resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.62.0.tgz#b4d6d192d5aeb75e91d0adef689c3ecef9879da7" + integrity sha512-iGlQJ1w5e3qPUryroO6v4lxg3ql1ztdTCwQW3xEwFawdyPLoeUSv48SYfMwc7kQA7h6ThUqflZIjgKAykeF9oA== "@typescript-eslint/eslint-plugin@^4.9.0": version "4.15.0"