From d3edc7689ae64053396793fe9bbb5b1756d8fb12 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Sun, 7 Nov 2021 12:54:52 +0000 Subject: [PATCH 01/54] Initial attempt to at snapshots --- src/core/NavigationMap.ts | 100 +++++++++++++++++++++++++----- src/extension.ts | 8 +++ src/processTargets/processMark.ts | 3 +- src/typings/Types.ts | 1 + 4 files changed, 94 insertions(+), 18 deletions(-) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index 5eb87b63f2..60f5efe68e 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -2,10 +2,92 @@ import { TextDocument } from "vscode"; import { HatStyleName } from "./constants"; import { Graph, Token } from "../typings/Types"; +interface NavigationMapSnapshot { + snapshotId: string; + navigationMap: IndividualNavigationMap; +} + /** * Maps from (hatStyle, character) pairs to tokens */ export default class NavigationMap { + activeMap: IndividualNavigationMap; + mapSnapshot?: NavigationMapSnapshot; + + constructor(private graph: Graph) { + graph.extensionContext.subscriptions.push(this); + this.activeMap = new IndividualNavigationMap(graph); + } + + 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 }; + } + + public getEntries() { + return this.activeMap.getEntries(); + } + + public addToken(hatStyle: HatStyleName, character: string, token: Token) { + this.activeMap.addToken(hatStyle, character, token); + } + + public getToken( + hatStyle: HatStyleName, + character: string, + snapshotId?: string + ) { + let individualMap: IndividualNavigationMap; + + if (snapshotId == null) { + individualMap = this.activeMap; + } else { + if (snapshotId !== this.mapSnapshot?.snapshotId) { + throw Error(`Unknown snapshot id ${snapshotId}`); + } + + individualMap = this.mapSnapshot.navigationMap; + } + + return individualMap.getToken(hatStyle, character); + } + + public clear() { + this.activeMap.clear(); + } + + public dispose() { + this.activeMap.dispose(); + + if (this.mapSnapshot != null) { + this.mapSnapshot.navigationMap.dispose(); + } + } + + takeSnapshot(snapshotId: string) { + if (this.mapSnapshot != null) { + this.mapSnapshot.navigationMap.dispose(); + } + + this.mapSnapshot = { + snapshotId, + navigationMap: this.activeMap, + }; + + this.activeMap = new IndividualNavigationMap(this.graph); + } +} + +class IndividualNavigationMap { private documentTokenLists: Map = new Map(); private deregisterFunctions: (() => void)[] = []; @@ -13,9 +95,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,20 +112,6 @@ export default class NavigationMap { return currentValue; } - 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 }; - } - public getEntries() { return Object.entries(this.map); } diff --git a/src/extension.ts b/src/extension.ts index 612076a212..37e5ebc13e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -65,6 +65,13 @@ export async function activate(context: vscode.ExtensionContext) { } ); + const takeHatMapSnapshotDisposable = vscode.commands.registerCommand( + "cursorless.takeHatMapSnapshot", + (snapshotId: string) => { + graph.navigationMap.takeSnapshot(snapshotId); + } + ); + const graph = makeGraph({ ...graphFactories, extensionContext: () => context, @@ -250,6 +257,7 @@ export async function activate(context: vscode.ExtensionContext) { cursorlessRecordTestCaseDisposable, toggleDecorationsDisposable, recomputeDecorationStylesDisposable, + takeHatMapSnapshotDisposable, vscode.workspace.onDidChangeConfiguration(recomputeDecorationStyles), vscode.window.onDidChangeTextEditorVisibleRanges(addDecorationsDebounced), vscode.window.onDidChangeActiveTextEditor(addDecorationsDebounced), diff --git a/src/processTargets/processMark.ts b/src/processTargets/processMark.ts index acbf5f5c3a..ba55ce9bd8 100644 --- a/src/processTargets/processMark.ts +++ b/src/processTargets/processMark.ts @@ -136,7 +136,8 @@ function processDecoratedSymbol( ) { const token = context.navigationMap.getToken( mark.symbolColor, - mark.character + mark.character, + mark.snapshotId ); if (token == null) { throw new Error( diff --git a/src/typings/Types.ts b/src/typings/Types.ts index 4182b62f91..7e4ea27b5c 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -42,6 +42,7 @@ export interface DecoratedSymbol { type: "decoratedSymbol"; symbolColor: HatStyleName; character: string; + snapshotId?: string; } export type LineNumberType = "absolute" | "relative" | "modulo100"; From 4ff14be7b46f24f702097a886ce7ab9df59c5060 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Sun, 7 Nov 2021 15:01:57 +0000 Subject: [PATCH 02/54] Switch to unnamed snapshots --- src/core/NavigationMap.ts | 14 ++++++++------ src/processTargets/processMark.ts | 2 +- src/typings/Types.ts | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index 60f5efe68e..ee9459a3e6 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -44,18 +44,20 @@ export default class NavigationMap { public getToken( hatStyle: HatStyleName, character: string, - snapshotId?: string + useSnapshot?: boolean ) { let individualMap: IndividualNavigationMap; - if (snapshotId == null) { - individualMap = this.activeMap; - } else { - if (snapshotId !== this.mapSnapshot?.snapshotId) { - throw Error(`Unknown snapshot id ${snapshotId}`); + if (useSnapshot) { + if (this.mapSnapshot == null) { + throw new Error( + "Navigation map snapshot requested, but no snapshot has been taken" + ); } individualMap = this.mapSnapshot.navigationMap; + } else { + individualMap = this.activeMap; } return individualMap.getToken(hatStyle, character); diff --git a/src/processTargets/processMark.ts b/src/processTargets/processMark.ts index ba55ce9bd8..ea120bb5c5 100644 --- a/src/processTargets/processMark.ts +++ b/src/processTargets/processMark.ts @@ -137,7 +137,7 @@ function processDecoratedSymbol( const token = context.navigationMap.getToken( mark.symbolColor, mark.character, - mark.snapshotId + mark.useSnapshot ); if (token == null) { throw new Error( diff --git a/src/typings/Types.ts b/src/typings/Types.ts index 7e4ea27b5c..4e4c2c05ab 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -42,7 +42,7 @@ export interface DecoratedSymbol { type: "decoratedSymbol"; symbolColor: HatStyleName; character: string; - snapshotId?: string; + useSnapshot?: boolean; } export type LineNumberType = "absolute" | "relative" | "modulo100"; From 134685c9e2b4b12b2c6ee9cba9dd040a5e2e2307 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Sun, 7 Nov 2021 16:48:33 +0000 Subject: [PATCH 03/54] A kind of workign attempt --- src/extension.ts | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 37e5ebc13e..15f302b280 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -10,11 +10,23 @@ 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 { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; +import { mkdir, stat } from "fs/promises"; +import { join } from "path"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); + const commandServerApi = await getCommandServerApi(); + + let hatMapSnapshotSignalPath: string | null = null; + let lastHatMapSnapshotSignalMtime: number = -1; + + if (commandServerApi != null) { + const cursorlessSubdir = commandServerApi.getNamedSubdir("cursorless"); + await mkdir(cursorlessSubdir, { recursive: true }); + hatMapSnapshotSignalPath = join(cursorlessSubdir, "hatMapSnapshotSignal"); + } var isActive = vscode.workspace .getConfiguration("cursorless") @@ -26,8 +38,21 @@ export async function activate(context: vscode.ExtensionContext) { }); } - function addDecorations() { + async function addDecorations() { if (isActive) { + if (hatMapSnapshotSignalPath != null) { + try { + const newMtime = (await stat(hatMapSnapshotSignalPath)).mtimeMs; + + if (newMtime > lastHatMapSnapshotSignalMtime) { + graph.navigationMap.takeSnapshot(); + } + } catch (err) { + if ((err as NodeJS.ErrnoException).code === "ENOENT") { + console.log("File not found!"); + } + } + } addDecorationsToEditors(graph.navigationMap, graph.decorations); } else { vscode.window.visibleTextEditors.forEach(clearEditorDecorations); @@ -65,13 +90,6 @@ export async function activate(context: vscode.ExtensionContext) { } ); - const takeHatMapSnapshotDisposable = vscode.commands.registerCommand( - "cursorless.takeHatMapSnapshot", - (snapshotId: string) => { - graph.navigationMap.takeSnapshot(snapshotId); - } - ); - const graph = makeGraph({ ...graphFactories, extensionContext: () => context, @@ -257,7 +275,6 @@ export async function activate(context: vscode.ExtensionContext) { cursorlessRecordTestCaseDisposable, toggleDecorationsDisposable, recomputeDecorationStylesDisposable, - takeHatMapSnapshotDisposable, vscode.workspace.onDidChangeConfiguration(recomputeDecorationStyles), vscode.window.onDidChangeTextEditorVisibleRanges(addDecorationsDebounced), vscode.window.onDidChangeActiveTextEditor(addDecorationsDebounced), From 3626b2925657975635a1bcbe154c453851eba1d2 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Sun, 7 Nov 2021 16:48:40 +0000 Subject: [PATCH 04/54] A kind of workign attempt --- src/core/NavigationMap.ts | 56 +++++++++++++++++++++++++++---------- src/extension.ts | 36 ++++++++++-------------- src/typings/Types.ts | 6 ++++ src/util/getExtensionApi.ts | 21 ++++++++++++-- 4 files changed, 81 insertions(+), 38 deletions(-) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index ee9459a3e6..4696a2e56c 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -1,24 +1,36 @@ import { TextDocument } from "vscode"; import { HatStyleName } from "./constants"; import { Graph, Token } from "../typings/Types"; - -interface NavigationMapSnapshot { - snapshotId: string; - navigationMap: IndividualNavigationMap; -} +import { mkdir, stat } from "fs/promises"; +import { join } from "path"; /** * Maps from (hatStyle, character) pairs to tokens */ export default class NavigationMap { activeMap: IndividualNavigationMap; - mapSnapshot?: NavigationMapSnapshot; + mapSnapshot?: IndividualNavigationMap; + + hatMapSnapshotSignalPath: string | null = null; + lastHatMapSnapshotSignalMtime: number = -1; constructor(private graph: Graph) { graph.extensionContext.subscriptions.push(this); this.activeMap = new IndividualNavigationMap(graph); } + async init() { + if (this.graph.commandServerApi != null) { + const cursorlessSubdir = + this.graph.commandServerApi.getNamedSubdir("cursorless"); + await mkdir(cursorlessSubdir, { recursive: true }); + this.hatMapSnapshotSignalPath = join( + cursorlessSubdir, + "hatMapSnapshotSignal" + ); + } + } + static getKey(hatStyle: HatStyleName, character: string) { return `${hatStyle}.${character}`; } @@ -55,7 +67,7 @@ export default class NavigationMap { ); } - individualMap = this.mapSnapshot.navigationMap; + individualMap = this.mapSnapshot; } else { individualMap = this.activeMap; } @@ -71,19 +83,35 @@ export default class NavigationMap { this.activeMap.dispose(); if (this.mapSnapshot != null) { - this.mapSnapshot.navigationMap.dispose(); + this.mapSnapshot.dispose(); + } + } + + async maybeTakeSnapshot() { + if (this.hatMapSnapshotSignalPath != null) { + try { + console.log(this.hatMapSnapshotSignalPath); + const newMtime = (await stat(this.hatMapSnapshotSignalPath)).mtimeMs; + + if (newMtime > this.lastHatMapSnapshotSignalMtime) { + console.log("taking snapshot"); + this.takeSnapshot(); + this.lastHatMapSnapshotSignalMtime = newMtime; + } + } catch (err) { + if ((err as NodeJS.ErrnoException).code !== "ENOENT") { + throw err; + } + } } } - takeSnapshot(snapshotId: string) { + private takeSnapshot() { if (this.mapSnapshot != null) { - this.mapSnapshot.navigationMap.dispose(); + this.mapSnapshot.dispose(); } - this.mapSnapshot = { - snapshotId, - navigationMap: this.activeMap, - }; + this.mapSnapshot = this.activeMap; this.activeMap = new IndividualNavigationMap(this.graph); } diff --git a/src/extension.ts b/src/extension.ts index 15f302b280..097b62ecfd 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -14,20 +14,12 @@ import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; import { mkdir, stat } from "fs/promises"; import { join } from "path"; +import { getPrimitiveTargets } from "./util/targetUtils"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); const commandServerApi = await getCommandServerApi(); - let hatMapSnapshotSignalPath: string | null = null; - let lastHatMapSnapshotSignalMtime: number = -1; - - if (commandServerApi != null) { - const cursorlessSubdir = commandServerApi.getNamedSubdir("cursorless"); - await mkdir(cursorlessSubdir, { recursive: true }); - hatMapSnapshotSignalPath = join(cursorlessSubdir, "hatMapSnapshotSignal"); - } - var isActive = vscode.workspace .getConfiguration("cursorless") .get("showOnStart")!; @@ -40,19 +32,7 @@ export async function activate(context: vscode.ExtensionContext) { async function addDecorations() { if (isActive) { - if (hatMapSnapshotSignalPath != null) { - try { - const newMtime = (await stat(hatMapSnapshotSignalPath)).mtimeMs; - - if (newMtime > lastHatMapSnapshotSignalMtime) { - graph.navigationMap.takeSnapshot(); - } - } catch (err) { - if ((err as NodeJS.ErrnoException).code === "ENOENT") { - console.log("File not found!"); - } - } - } + await graph.navigationMap.maybeTakeSnapshot(); addDecorationsToEditors(graph.navigationMap, graph.decorations); } else { vscode.window.visibleTextEditors.forEach(clearEditorDecorations); @@ -93,10 +73,12 @@ export async function activate(context: vscode.ExtensionContext) { const graph = makeGraph({ ...graphFactories, extensionContext: () => context, + commandServerApi: () => commandServerApi, } as FactoryMap); graph.snippets.init(); await graph.fontMeasurements.calculate(); + await graph.navigationMap.init(); const thatMark = new ThatMark(); const sourceMark = new ThatMark(); const testCaseRecorder = new TestCaseRecorder(context); @@ -133,6 +115,16 @@ export async function activate(context: vscode.ExtensionContext) { inputExtraArgs ); + if ( + getPrimitiveTargets(partialTargets).some( + (partialTarget) => + partialTarget.mark?.type === "decoratedSymbol" && + partialTarget.mark.useSnapshot + ) + ) { + await graph.navigationMap.maybeTakeSnapshot(); + } + console.debug(`spokenForm: ${spokenForm}`); console.debug(`action: ${actionName}`); console.debug(`partialTargets:`); diff --git a/src/typings/Types.ts b/src/typings/Types.ts index 4e4c2c05ab..2702a1985f 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -9,6 +9,7 @@ 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"; /** * A token within a text editor, including the current display line of the token @@ -398,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/getExtensionApi.ts b/src/util/getExtensionApi.ts index 4cf4cc9fb8..f18c127581 100644 --- a/src/util/getExtensionApi.ts +++ b/src/util/getExtensionApi.ts @@ -15,9 +15,19 @@ export interface ParseTreeApi { loadLanguage: (languageId: string) => Promise; } +export interface CommandServerApi { + getNamedSubdir(name: string): string; +} + 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 +36,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"); From 79f57598f42e61a4a8fb588397617bdfaac3d0cc Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 8 Nov 2021 17:42:17 +0000 Subject: [PATCH 05/54] Use command server signal API --- src/core/NavigationMap.ts | 61 +++++++++++++++++-------------------- src/extension.ts | 1 - src/util/getExtensionApi.ts | 9 +++++- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index 4696a2e56c..e772317b54 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -3,6 +3,7 @@ import { HatStyleName } from "./constants"; import { Graph, Token } from "../typings/Types"; import { mkdir, stat } from "fs/promises"; import { join } from "path"; +import { Signal } from "../util/getExtensionApi"; /** * Maps from (hatStyle, character) pairs to tokens @@ -11,24 +12,13 @@ export default class NavigationMap { activeMap: IndividualNavigationMap; mapSnapshot?: IndividualNavigationMap; - hatMapSnapshotSignalPath: string | null = null; - lastHatMapSnapshotSignalMtime: number = -1; + phraseStartSignal: Signal | null = null; + lastSignalVersion?: string; constructor(private graph: Graph) { graph.extensionContext.subscriptions.push(this); this.activeMap = new IndividualNavigationMap(graph); - } - - async init() { - if (this.graph.commandServerApi != null) { - const cursorlessSubdir = - this.graph.commandServerApi.getNamedSubdir("cursorless"); - await mkdir(cursorlessSubdir, { recursive: true }); - this.hatMapSnapshotSignalPath = join( - cursorlessSubdir, - "hatMapSnapshotSignal" - ); - } + this.phraseStartSignal = graph.commandServerApi?.signals.prePhrase ?? null; } static getKey(hatStyle: HatStyleName, character: string) { @@ -88,20 +78,13 @@ export default class NavigationMap { } async maybeTakeSnapshot() { - if (this.hatMapSnapshotSignalPath != null) { - try { - console.log(this.hatMapSnapshotSignalPath); - const newMtime = (await stat(this.hatMapSnapshotSignalPath)).mtimeMs; - - if (newMtime > this.lastHatMapSnapshotSignalMtime) { - console.log("taking snapshot"); - this.takeSnapshot(); - this.lastHatMapSnapshotSignalMtime = newMtime; - } - } catch (err) { - if ((err as NodeJS.ErrnoException).code !== "ENOENT") { - throw err; - } + if (this.phraseStartSignal != null) { + const newSignalVersion = await this.phraseStartSignal.getVersion(); + + if (newSignalVersion !== this.lastSignalVersion) { + console.debug("taking snapshot"); + this.takeSnapshot(); + this.lastSignalVersion = newSignalVersion; } } } @@ -111,9 +94,7 @@ export default class NavigationMap { this.mapSnapshot.dispose(); } - this.mapSnapshot = this.activeMap; - - this.activeMap = new IndividualNavigationMap(this.graph); + this.mapSnapshot = this.activeMap.clone(); } } @@ -142,15 +123,29 @@ class IndividualNavigationMap { return currentValue; } + public clone() { + const ret = new IndividualNavigationMap(this.graph); + + this.getEntries().forEach(([key, token]) => { + ret.addTokenByKey(key, { ...token }); + }); + + return ret; + } + public getEntries() { 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 addToken(hatStyle: HatStyleName, character: string, token: Token) { + this.addTokenByKey(NavigationMap.getKey(hatStyle, character), token); + } + public getToken(hatStyle: HatStyleName, character: string) { return this.map[NavigationMap.getKey(hatStyle, character)]; } diff --git a/src/extension.ts b/src/extension.ts index 097b62ecfd..2e3562a76d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -78,7 +78,6 @@ export async function activate(context: vscode.ExtensionContext) { graph.snippets.init(); await graph.fontMeasurements.calculate(); - await graph.navigationMap.init(); const thatMark = new ThatMark(); const sourceMark = new ThatMark(); const testCaseRecorder = new TestCaseRecorder(context); diff --git a/src/util/getExtensionApi.ts b/src/util/getExtensionApi.ts index f18c127581..36a963cfe6 100644 --- a/src/util/getExtensionApi.ts +++ b/src/util/getExtensionApi.ts @@ -15,8 +15,15 @@ export interface ParseTreeApi { loadLanguage: (languageId: string) => Promise; } +export interface Signal { + getVersion(): Promise; +} + export interface CommandServerApi { - getNamedSubdir(name: string): string; + signals: { + getNamedSignal: (name: string) => Signal; + prePhrase: Signal; + }; } export async function getExtensionApi(extensionId: string) { From e81cf2dcc272650c5bde6c0956a656ee1c44e973 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 8 Nov 2021 18:09:47 +0000 Subject: [PATCH 06/54] More error robustness --- src/core/NavigationMap.ts | 29 +++++++++++++++++++---------- src/util/getExtensionApi.ts | 2 +- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index e772317b54..5cac727ee8 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -1,8 +1,6 @@ import { TextDocument } from "vscode"; import { HatStyleName } from "./constants"; import { Graph, Token } from "../typings/Types"; -import { mkdir, stat } from "fs/promises"; -import { join } from "path"; import { Signal } from "../util/getExtensionApi"; /** @@ -13,7 +11,7 @@ export default class NavigationMap { mapSnapshot?: IndividualNavigationMap; phraseStartSignal: Signal | null = null; - lastSignalVersion?: string; + lastSignalVersion: string | null = null; constructor(private graph: Graph) { graph.extensionContext.subscriptions.push(this); @@ -48,21 +46,29 @@ export default class NavigationMap { character: string, useSnapshot?: boolean ) { - let individualMap: IndividualNavigationMap; + return this.getIndividualMap(useSnapshot).getToken(hatStyle, character); + } + private getIndividualMap(useSnapshot: boolean | undefined) { if (useSnapshot) { + if (this.lastSignalVersion == null) { + console.error( + "Snapshot requested but no signal was present; please upgrade command client" + ); + return this.activeMap; + } + if (this.mapSnapshot == null) { - throw new Error( + console.error( "Navigation map snapshot requested, but no snapshot has been taken" ); + return this.activeMap; } - individualMap = this.mapSnapshot; - } else { - individualMap = this.activeMap; + return this.mapSnapshot; } - return individualMap.getToken(hatStyle, character); + return this.activeMap; } public clear() { @@ -83,8 +89,11 @@ export default class NavigationMap { if (newSignalVersion !== this.lastSignalVersion) { console.debug("taking snapshot"); - this.takeSnapshot(); this.lastSignalVersion = newSignalVersion; + + if (newSignalVersion != null) { + this.takeSnapshot(); + } } } } diff --git a/src/util/getExtensionApi.ts b/src/util/getExtensionApi.ts index 36a963cfe6..9091d813b5 100644 --- a/src/util/getExtensionApi.ts +++ b/src/util/getExtensionApi.ts @@ -16,7 +16,7 @@ export interface ParseTreeApi { } export interface Signal { - getVersion(): Promise; + getVersion(): Promise; } export interface CommandServerApi { From a72d6b7f49e26b2a8d05eae4655ff8c2a5583ed4 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 8 Nov 2021 18:40:13 +0000 Subject: [PATCH 07/54] Working version --- src/extension.ts | 11 ++--- .../recorded/navigationMap/takeHarp.yml | 26 +++++++++++ src/test/suite/recorded.test.ts | 7 ++- src/testUtil/TestCase.ts | 5 ++- src/testUtil/extractTargetedMarks.ts | 9 +++- src/util/canonicalizeAndValidateCommand.ts | 4 +- src/util/canonicalizeTargets.ts | 4 +- src/util/doTargetsRequireSnapshot.ts | 19 ++++++++ ...rgets.ts => getPartialPrimitiveTargets.ts} | 44 ++++++++++++++----- 9 files changed, 103 insertions(+), 26 deletions(-) create mode 100644 src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml create mode 100644 src/util/doTargetsRequireSnapshot.ts rename src/util/{getPrimitiveTargets.ts => getPartialPrimitiveTargets.ts} (58%) diff --git a/src/extension.ts b/src/extension.ts index 2e3562a76d..1f05dc55f2 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -15,6 +15,7 @@ import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCo import { mkdir, stat } from "fs/promises"; import { join } from "path"; import { getPrimitiveTargets } from "./util/targetUtils"; +import { doTargetsUseSnapshot } from "./util/doTargetsRequireSnapshot"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); @@ -114,13 +115,8 @@ export async function activate(context: vscode.ExtensionContext) { inputExtraArgs ); - if ( - getPrimitiveTargets(partialTargets).some( - (partialTarget) => - partialTarget.mark?.type === "decoratedSymbol" && - partialTarget.mark.useSnapshot - ) - ) { + const useSnapshot = doTargetsUseSnapshot(partialTargets); + if (useSnapshot) { await graph.navigationMap.maybeTakeSnapshot(); } @@ -165,6 +161,7 @@ export async function activate(context: vscode.ExtensionContext) { sourceMark, navigationMap: graph.navigationMap!, spokenForm, + useSnapshot, }; await testCaseRecorder.preCommandHook(command, context); } diff --git a/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml b/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml new file mode 100644 index 0000000000..d936f5fc9c --- /dev/null +++ b/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml @@ -0,0 +1,26 @@ +spokenForm: take harp +languageId: plaintext +command: + actionName: setSelection + partialTargets: + - type: primitive + mark: {type: decoratedSymbol, symbolColor: default, character: h, useSnapshot: true} + extraArgs: [] +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, useSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}] diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index b9844dbc09..405e03d641 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -25,6 +25,7 @@ import { import { enableDebugLog } from "../../util/debug"; import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; import asyncSafety from "./asyncSafety"; +import { doTargetsUseSnapshot } from "../../util/doTargetsRequireSnapshot"; function createPosition(position: PositionPlainObject) { return new vscode.Position(position.line, position.character); @@ -114,6 +115,9 @@ async function runTest(file: string) { // Assert that recorded decorations are present checkMarks(fixture.initialState.marks, cursorlessApi.navigationMap); + const useSnapshot = doTargetsUseSnapshot(fixture.command.partialTargets); + // TODO: Issue the barrier if we need to + const returnValue = await vscode.commands.executeCommand( "cursorless.command", fixture.spokenForm, @@ -128,7 +132,8 @@ async function runTest(file: string) { : marksToPlainObject( extractTargetedMarks( Object.keys(fixture.finalState.marks) as string[], - cursorlessApi.navigationMap + cursorlessApi.navigationMap, + useSnapshot ) ); diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index 5bbe0d169c..8ed67cd8b4 100644 --- a/src/testUtil/TestCase.ts +++ b/src/testUtil/TestCase.ts @@ -23,6 +23,7 @@ export type TestCaseContext = { sourceMark: ThatMark; targets: Target[]; navigationMap: NavigationMap; + useSnapshot: boolean; }; export type TestCaseFixture = { @@ -73,7 +74,7 @@ export class TestCase { private getMarks() { let marks: Record; - const { navigationMap } = this.context; + const { navigationMap, useSnapshot } = this.context; if (this.isNavigationMapTest) { // If we're doing a navigation map test, then we grab the entire @@ -81,7 +82,7 @@ export class TestCase { // referenced in the expected follow up command marks = Object.fromEntries(navigationMap.getEntries()); } else { - marks = extractTargetedMarks(this.targetKeys, navigationMap); + marks = extractTargetedMarks(this.targetKeys, navigationMap, useSnapshot); } return marksToPlainObject(marks); diff --git a/src/testUtil/extractTargetedMarks.ts b/src/testUtil/extractTargetedMarks.ts index 2a7fad2b90..0ed882c481 100644 --- a/src/testUtil/extractTargetedMarks.ts +++ b/src/testUtil/extractTargetedMarks.ts @@ -31,13 +31,18 @@ export function extractTargetKeys(target: Target): string[] { export function extractTargetedMarks( targetKeys: string[], - navigationMap: NavigationMap + navigationMap: NavigationMap, + useSnapshot: boolean ) { const targetedMarks: { [decoratedCharacter: string]: Token } = {}; targetKeys.forEach((key) => { const { hatStyle, character } = NavigationMap.splitKey(key); - targetedMarks[key] = navigationMap.getToken(hatStyle, character); + targetedMarks[key] = navigationMap.getToken( + hatStyle, + character, + useSnapshot + ); }); return targetedMarks; diff --git a/src/util/canonicalizeAndValidateCommand.ts b/src/util/canonicalizeAndValidateCommand.ts index 9efeb901eb..6533058f67 100644 --- a/src/util/canonicalizeAndValidateCommand.ts +++ b/src/util/canonicalizeAndValidateCommand.ts @@ -1,7 +1,7 @@ import canonicalizeActionName from "./canonicalizeActionName"; import canonicalizeTargets from "./canonicalizeTargets"; import { ActionType, PartialTarget, SelectionType } from "../typings/Types"; -import { getPrimitiveTargets } from "./getPrimitiveTargets"; +import { getPartialPrimitiveTargets } from "./getPartialPrimitiveTargets"; export function canonicalizeAndValidateCommand( inputActionName: string, @@ -40,7 +40,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..8e224f40a1 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 "./getPartialPrimitiveTargets"; 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/doTargetsRequireSnapshot.ts b/src/util/doTargetsRequireSnapshot.ts new file mode 100644 index 0000000000..0715f57b0a --- /dev/null +++ b/src/util/doTargetsRequireSnapshot.ts @@ -0,0 +1,19 @@ +import { PartialTarget } from "../typings/Types"; +import { uniq } from "lodash"; +import { getPartialPrimitiveTargets } from "./targetUtils"; + +export function doTargetsUseSnapshot(targets: PartialTarget[]): boolean { + const snapshotIds = getPartialPrimitiveTargets(targets).map((target) => + target.mark?.type === "decoratedSymbol" + ? target.mark.useSnapshot + : undefined + ); + + const uniqueSnapshotIds = uniq(snapshotIds); + + if (uniqueSnapshotIds.length !== 1) { + throw new Error("Must use the same snapshot id for all targets"); + } + + return uniqueSnapshotIds[0] ?? false; +} diff --git a/src/util/getPrimitiveTargets.ts b/src/util/getPartialPrimitiveTargets.ts similarity index 58% rename from src/util/getPrimitiveTargets.ts rename to src/util/getPartialPrimitiveTargets.ts index c6abf09d93..456445d3d7 100644 --- a/src/util/getPrimitiveTargets.ts +++ b/src/util/getPartialPrimitiveTargets.ts @@ -11,22 +11,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 +56,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 +77,7 @@ function transformPrimitiveTargetsHelper( ...target, elements: target.elements.map( (element) => - transformPrimitiveTargetsHelper(element, func) as + transformPartialPrimitiveTargetsHelper(element, func) as | PartialPrimitiveTarget | PartialRangeTarget ), From cb60d9dff97ceb3abfca1e0ca3187312799944fc Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 8 Nov 2021 20:36:56 +0000 Subject: [PATCH 08/54] Have navigation map return snapshot --- src/core/NavigationMap.ts | 42 +++++++++++++++++++-------------------- src/extension.ts | 1 - 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index 5cac727ee8..d92a5cd2e5 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -7,15 +7,15 @@ import { Signal } from "../util/getExtensionApi"; * Maps from (hatStyle, character) pairs to tokens */ export default class NavigationMap { - activeMap: IndividualNavigationMap; - mapSnapshot?: IndividualNavigationMap; + activeMap: IndividualHatMap; + mapSnapshot?: IndividualHatMap; phraseStartSignal: Signal | null = null; lastSignalVersion: string | null = null; constructor(private graph: Graph) { graph.extensionContext.subscriptions.push(this); - this.activeMap = new IndividualNavigationMap(graph); + this.activeMap = new IndividualHatMap(graph); this.phraseStartSignal = graph.commandServerApi?.signals.prePhrase ?? null; } @@ -33,23 +33,17 @@ export default class NavigationMap { return { hatStyle: hatStyle as HatStyleName, character }; } - public getEntries() { - return this.activeMap.getEntries(); + getWritableMap() { + return this.getIndividualMap(false) as Promise; } - public addToken(hatStyle: HatStyleName, character: string, token: Token) { - this.activeMap.addToken(hatStyle, character, token); + getReadableMap(useSnapshot: boolean) { + return this.getIndividualMap(useSnapshot) as Promise; } - public getToken( - hatStyle: HatStyleName, - character: string, - useSnapshot?: boolean - ) { - return this.getIndividualMap(useSnapshot).getToken(hatStyle, character); - } + async getIndividualMap(useSnapshot: boolean) { + await this.maybeTakeSnapshot(); - private getIndividualMap(useSnapshot: boolean | undefined) { if (useSnapshot) { if (this.lastSignalVersion == null) { console.error( @@ -71,10 +65,6 @@ export default class NavigationMap { return this.activeMap; } - public clear() { - this.activeMap.clear(); - } - public dispose() { this.activeMap.dispose(); @@ -107,7 +97,17 @@ export default class NavigationMap { } } -class IndividualNavigationMap { +interface ReadableHatMap { + getEntries(): [string, Token][]; + getToken(hatStyle: HatStyleName, character: string): Token; +} + +interface WritableHatMap { + clear(): void; + addToken(hatStyle: HatStyleName, character: string, token: Token): void; +} + +class IndividualHatMap implements ReadableHatMap, WritableHatMap { private documentTokenLists: Map = new Map(); private deregisterFunctions: (() => void)[] = []; @@ -133,7 +133,7 @@ class IndividualNavigationMap { } public clone() { - const ret = new IndividualNavigationMap(this.graph); + const ret = new IndividualHatMap(this.graph); this.getEntries().forEach(([key, token]) => { ret.addTokenByKey(key, { ...token }); diff --git a/src/extension.ts b/src/extension.ts index 1f05dc55f2..49bf1f7081 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -33,7 +33,6 @@ export async function activate(context: vscode.ExtensionContext) { async function addDecorations() { if (isActive) { - await graph.navigationMap.maybeTakeSnapshot(); addDecorationsToEditors(graph.navigationMap, graph.decorations); } else { vscode.window.visibleTextEditors.forEach(clearEditorDecorations); From 9c813da823ef85c4144c8e80f56958e3faca2d18 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 14:44:00 +0000 Subject: [PATCH 09/54] Attempt at big refactor --- src/core/Decorations.ts | 43 ++++++++++- src/core/HatAllocator.ts | 91 ++++++++++++++++++++++ src/core/IndividualHatMap.ts | 82 ++++++++++++++++++++ src/core/NavigationMap.ts | 110 ++++++--------------------- src/extension.ts | 106 ++++---------------------- src/processTargets/processMark.ts | 3 +- src/test/suite/recorded.test.ts | 18 ++--- src/testUtil/TestCase.ts | 5 +- src/testUtil/extractTargetedMarks.ts | 10 +-- src/typings/Types.ts | 3 +- src/util/addDecorationsToEditor.ts | 4 +- src/util/getExtensionApi.ts | 9 ++- 12 files changed, 274 insertions(+), 210 deletions(-) create mode 100644 src/core/HatAllocator.ts create mode 100644 src/core/IndividualHatMap.ts diff --git a/src/core/Decorations.ts b/src/core/Decorations.ts index e24e6b425d..8252be08a3 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, @@ -30,24 +30,56 @@ 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) + ); + } + + registerDecorationChangeListener(listener: DecorationChangeListener) { + this.decorationChangeListeners.push(listener); + + return () => { + pull(this.decorationChangeListeners, listener); + }; } - destroyDecorations() { + 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 +157,8 @@ export default class Decorations { this.decorationMap = Object.fromEntries( this.decorations.map(({ name, decoration }) => [name, decoration]) ); + + this.decorationChangeListeners.forEach((listener) => listener()); } private constructHatStyleMap() { @@ -279,5 +313,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..504b435cd0 --- /dev/null +++ b/src/core/HatAllocator.ts @@ -0,0 +1,91 @@ +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 disposableFunctions: (() => void)[] = []; + + constructor(private graph: Graph, private context: Context) { + this.isActive = vscode.workspace + .getConfiguration("cursorless") + .get("showOnStart")!; + + this.addDecorationsDebounced = this.addDecorationsDebounced.bind(this); + + this.disposableFunctions.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.disposableFunctions.forEach((dispose) => dispose()); + + if (this.timeoutHandle != null) { + clearTimeout(this.timeoutHandle); + } + } +} diff --git a/src/core/IndividualHatMap.ts b/src/core/IndividualHatMap.ts new file mode 100644 index 0000000000..5c2535798e --- /dev/null +++ b/src/core/IndividualHatMap.ts @@ -0,0 +1,82 @@ +import { TextDocument } from "vscode"; +import { HatStyleName } from "./constants"; +import { Graph, Token } from "../typings/Types"; +import NavigationMap from "./NavigationMap"; + +export interface ReadOnlyHatMap { + getEntries(): [string, Token][]; + getToken(hatStyle: HatStyleName, character: string): Token; +} + +export class IndividualHatMap implements ReadOnlyHatMap { + private isExpired: boolean = true; + private documentTokenLists: Map = new Map(); + private deregisterFunctions: (() => void)[] = []; + + private map: { + [decoratedCharacter: string]: Token; + } = {}; + + constructor(private graph: Graph) {} + + private getDocumentTokenList(document: TextDocument) { + const key = document.uri.toString(); + let currentValue = this.documentTokenLists.get(key); + + if (currentValue == null) { + currentValue = []; + this.documentTokenLists.set(key, currentValue); + this.deregisterFunctions.push( + this.graph.rangeUpdater.registerRangeInfoList(document, currentValue) + ); + } + + return currentValue; + } + + clone() { + const ret = new IndividualHatMap(this.graph); + + this.getEntries().forEach(([key, token]) => { + ret.addTokenByKey(key, { ...token }); + }); + + return ret; + } + + getEntries() { + this.checkExpired(); + return Object.entries(this.map); + } + + private addTokenByKey(key: string, token: Token) { + this.map[key] = token; + this.getDocumentTokenList(token.editor.document).push(token); + } + + addToken(hatStyle: HatStyleName, character: string, token: Token) { + this.addTokenByKey(NavigationMap.getKey(hatStyle, character), token); + } + + getToken(hatStyle: HatStyleName, character: string) { + this.checkExpired(); + return this.map[NavigationMap.getKey(hatStyle, character)]; + } + + clear() { + this.map = {}; + this.documentTokenLists = new Map(); + this.deregisterFunctions.forEach((func) => func()); + } + + checkExpired() { + if (this.isExpired) { + throw Error("Map snapshot has expired"); + } + } + + dispose() { + this.isExpired = true; + this.deregisterFunctions.forEach((func) => func()); + } +} diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index d92a5cd2e5..64d922583f 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -1,22 +1,34 @@ -import { TextDocument } from "vscode"; import { HatStyleName } from "./constants"; -import { Graph, Token } from "../typings/Types"; +import { Graph } from "../typings/Types"; import { Signal } from "../util/getExtensionApi"; +import { IndividualHatMap, ReadOnlyHatMap } from "./IndividualHatMap"; +import { HatAllocator } from "./HatAllocator"; /** * Maps from (hatStyle, character) pairs to tokens */ export default class NavigationMap { - activeMap: IndividualHatMap; - mapSnapshot?: IndividualHatMap; + private activeMap: IndividualHatMap; + private mapSnapshot?: IndividualHatMap; - phraseStartSignal: Signal | null = null; - lastSignalVersion: string | null = null; + private phraseStartSignal: Signal | 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.phraseStartSignal = graph.commandServerApi?.signals.prePhrase ?? null; + + this.getActiveMap = this.getActiveMap.bind(this); + + this.hatAllocator = new HatAllocator(graph, { + getActiveMap: this.getActiveMap, + }); + } + + init() { + this.hatAllocator.addDecorations(); } static getKey(hatStyle: HatStyleName, character: string) { @@ -33,15 +45,12 @@ export default class NavigationMap { return { hatStyle: hatStyle as HatStyleName, character }; } - getWritableMap() { - return this.getIndividualMap(false) as Promise; - } - - getReadableMap(useSnapshot: boolean) { - return this.getIndividualMap(useSnapshot) as Promise; + private async getActiveMap() { + await this.maybeTakeSnapshot(); + return this.activeMap; } - async getIndividualMap(useSnapshot: boolean) { + async getReadableMap(useSnapshot: boolean): Promise { await this.maybeTakeSnapshot(); if (useSnapshot) { @@ -73,7 +82,7 @@ export default class NavigationMap { } } - async maybeTakeSnapshot() { + private async maybeTakeSnapshot() { if (this.phraseStartSignal != null) { const newSignalVersion = await this.phraseStartSignal.getVersion(); @@ -96,76 +105,3 @@ export default class NavigationMap { this.mapSnapshot = this.activeMap.clone(); } } - -interface ReadableHatMap { - getEntries(): [string, Token][]; - getToken(hatStyle: HatStyleName, character: string): Token; -} - -interface WritableHatMap { - clear(): void; - addToken(hatStyle: HatStyleName, character: string, token: Token): void; -} - -class IndividualHatMap implements ReadableHatMap, WritableHatMap { - private documentTokenLists: Map = new Map(); - private deregisterFunctions: (() => void)[] = []; - - private map: { - [decoratedCharacter: string]: Token; - } = {}; - - constructor(private graph: Graph) {} - - private getDocumentTokenList(document: TextDocument) { - const key = document.uri.toString(); - let currentValue = this.documentTokenLists.get(key); - - if (currentValue == null) { - currentValue = []; - this.documentTokenLists.set(key, currentValue); - this.deregisterFunctions.push( - this.graph.rangeUpdater.registerRangeInfoList(document, currentValue) - ); - } - - return currentValue; - } - - public clone() { - const ret = new IndividualHatMap(this.graph); - - this.getEntries().forEach(([key, token]) => { - ret.addTokenByKey(key, { ...token }); - }); - - return ret; - } - - public getEntries() { - return Object.entries(this.map); - } - - private addTokenByKey(key: string, token: Token) { - this.map[key] = token; - this.getDocumentTokenList(token.editor.document).push(token); - } - - public addToken(hatStyle: HatStyleName, character: string, token: Token) { - this.addTokenByKey(NavigationMap.getKey(hatStyle, character), token); - } - - public getToken(hatStyle: HatStyleName, character: string) { - return this.map[NavigationMap.getKey(hatStyle, character)]; - } - - public clear() { - this.map = {}; - this.documentTokenLists = new Map(); - this.deregisterFunctions.forEach((func) => func()); - } - - public dispose() { - this.deregisterFunctions.forEach((func) => func()); - } -} diff --git a/src/extension.ts b/src/extension.ts index 49bf1f7081..fda491b805 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,74 +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 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 { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; -import { mkdir, stat } from "fs/promises"; -import { join } from "path"; -import { getPrimitiveTargets } from "./util/targetUtils"; import { doTargetsUseSnapshot } from "./util/doTargetsRequireSnapshot"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); const commandServerApi = await getCommandServerApi(); - var isActive = vscode.workspace - .getConfiguration("cursorless") - .get("showOnStart")!; - - function clearEditorDecorations(editor: vscode.TextEditor) { - graph.decorations.decorations.forEach(({ decoration }) => { - editor.setDecorations(decoration, []); - }); - } - - async 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); + function handleEdit(edit: vscode.TextDocumentChangeEvent) { + // TODO. Disabled for now because it triggers on undo as well + // wait until next release when there is a cause field + // checkForEditsOutsideViewport(edit); } - - const toggleDecorationsDisposable = vscode.commands.registerCommand( - "cursorless.toggleDecorations", - () => { - isActive = !isActive; - addDecorationsDebounced(); - } - ); - - const recomputeDecorationStylesDisposable = vscode.commands.registerCommand( - "cursorless.recomputeDecorationStyles", - () => { - graph.fontMeasurements.clearCache(); - recomputeDecorationStyles(); - } - ); + // vscode.workspace.onDidChangeTextDocument(handleEdit) const graph = makeGraph({ ...graphFactories, @@ -76,6 +28,7 @@ export async function activate(context: vscode.ExtensionContext) { commandServerApi: () => commandServerApi, } as FactoryMap); graph.snippets.init(); + graph.navigationMap.init(); await graph.fontMeasurements.calculate(); const thatMark = new ThatMark(); @@ -115,9 +68,9 @@ export async function activate(context: vscode.ExtensionContext) { ); const useSnapshot = doTargetsUseSnapshot(partialTargets); - if (useSnapshot) { - await graph.navigationMap.maybeTakeSnapshot(); - } + const readableHatMap = await graph.navigationMap.getReadableMap( + useSnapshot + ); console.debug(`spokenForm: ${spokenForm}`); console.debug(`action: ${actionName}`); @@ -144,7 +97,7 @@ export async function activate(context: vscode.ExtensionContext) { editor: vscode.window.activeTextEditor!, })) ?? [], currentEditor: vscode.window.activeTextEditor, - navigationMap: graph.navigationMap, + navigationMap: readableHatMap, thatMark: thatMark.exists() ? thatMark.get() : [], sourceMark: sourceMark.exists() ? sourceMark.get() : [], getNodeAtLocation, @@ -158,7 +111,7 @@ export async function activate(context: vscode.ExtensionContext) { targets, thatMark, sourceMark, - navigationMap: graph.navigationMap!, + navigationMap: readableHatMap, spokenForm, useSnapshot, }; @@ -213,8 +166,6 @@ export async function activate(context: vscode.ExtensionContext) { } ); - addDecorationsDebounced(); - function checkForEditsOutsideViewport(event: vscode.TextDocumentChangeEvent) { const editor = vscode.window.activeTextEditor; if (editor == null || editor.document !== event.document) { @@ -242,49 +193,18 @@ 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: process.env.CURSORLESS_TEST == null ? undefined : graph, experimental: { registerThirdPartySnippets: graph.snippets.registerThirdPartySnippets, }, diff --git a/src/processTargets/processMark.ts b/src/processTargets/processMark.ts index ea120bb5c5..acbf5f5c3a 100644 --- a/src/processTargets/processMark.ts +++ b/src/processTargets/processMark.ts @@ -136,8 +136,7 @@ function processDecoratedSymbol( ) { const token = context.navigationMap.getToken( mark.symbolColor, - mark.character, - mark.useSnapshot + mark.character ); if (token == null) { throw new Error( diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index 405e03d641..8d046c485e 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -26,6 +26,7 @@ import { enableDebugLog } from "../../util/debug"; import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; import asyncSafety from "./asyncSafety"; import { doTargetsUseSnapshot } from "../../util/doTargetsRequireSnapshot"; +import { ReadOnlyHatMap } from "../../core/IndividualHatMap"; function createPosition(position: PositionPlainObject) { return new vscode.Position(position.line, position.character); @@ -66,6 +67,7 @@ async function runTest(file: 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({ @@ -109,15 +111,14 @@ async function runTest(file: string) { excludeFields.push("clipboard"); } - // Wait for cursorless to set up decorations - cursorlessApi.addDecorations(); - - // Assert that recorded decorations are present - checkMarks(fixture.initialState.marks, cursorlessApi.navigationMap); - const useSnapshot = doTargetsUseSnapshot(fixture.command.partialTargets); // TODO: Issue the barrier if we need to + const readableHatMap = await graph.navigationMap.getReadableMap(useSnapshot); + + // Assert that recorded decorations are present + checkMarks(fixture.initialState.marks, readableHatMap); + const returnValue = await vscode.commands.executeCommand( "cursorless.command", fixture.spokenForm, @@ -132,8 +133,7 @@ async function runTest(file: string) { : marksToPlainObject( extractTargetedMarks( Object.keys(fixture.finalState.marks) as string[], - cursorlessApi.navigationMap, - useSnapshot + readableHatMap ) ); @@ -166,7 +166,7 @@ async function runTest(file: string) { function checkMarks( marks: SerializedMarks | undefined, - navigationMap: NavigationMap + navigationMap: ReadOnlyHatMap ) { if (marks == null) { return; diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index 8ed67cd8b4..d0f3cae7f6 100644 --- a/src/testUtil/TestCase.ts +++ b/src/testUtil/TestCase.ts @@ -10,6 +10,7 @@ import { marksToPlainObject, SerializedMarks } from "./toPlainObject"; import { takeSnapshot, TestCaseSnapshot } from "./takeSnapshot"; import serialize from "./serialize"; import { pick } from "lodash"; +import { ReadOnlyHatMap } from "../core/IndividualHatMap"; export type TestCaseCommand = { actionName: ActionType; @@ -22,7 +23,7 @@ export type TestCaseContext = { thatMark: ThatMark; sourceMark: ThatMark; targets: Target[]; - navigationMap: NavigationMap; + navigationMap: ReadOnlyHatMap; useSnapshot: boolean; }; @@ -82,7 +83,7 @@ export class TestCase { // referenced in the expected follow up command marks = Object.fromEntries(navigationMap.getEntries()); } else { - marks = extractTargetedMarks(this.targetKeys, navigationMap, useSnapshot); + marks = extractTargetedMarks(this.targetKeys, navigationMap); } return marksToPlainObject(marks); diff --git a/src/testUtil/extractTargetedMarks.ts b/src/testUtil/extractTargetedMarks.ts index 0ed882c481..f21824d88a 100644 --- a/src/testUtil/extractTargetedMarks.ts +++ b/src/testUtil/extractTargetedMarks.ts @@ -1,4 +1,5 @@ import { HatStyleName } from "../core/constants"; +import { ReadOnlyHatMap } from "../core/IndividualHatMap"; import NavigationMap from "../core/NavigationMap"; import { PrimitiveTarget, Target, Token } from "../typings/Types"; @@ -31,18 +32,13 @@ export function extractTargetKeys(target: Target): string[] { export function extractTargetedMarks( targetKeys: string[], - navigationMap: NavigationMap, - useSnapshot: boolean + navigationMap: ReadOnlyHatMap ) { const targetedMarks: { [decoratedCharacter: string]: Token } = {}; targetKeys.forEach((key) => { const { hatStyle, character } = NavigationMap.splitKey(key); - targetedMarks[key] = navigationMap.getToken( - hatStyle, - character, - useSnapshot - ); + targetedMarks[key] = navigationMap.getToken(hatStyle, character); }); return targetedMarks; diff --git a/src/typings/Types.ts b/src/typings/Types.ts index 2702a1985f..de67ff27f5 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -10,6 +10,7 @@ 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 @@ -234,7 +235,7 @@ export type Target = PrimitiveTarget | RangeTarget | ListTarget; export interface ProcessedTargetsContext { currentSelections: SelectionWithEditor[]; currentEditor: vscode.TextEditor | undefined; - navigationMap: NavigationMap; + navigationMap: ReadOnlyHatMap; thatMark: SelectionWithEditor[]; sourceMark: SelectionWithEditor[]; getNodeAtLocation: (location: Location) => SyntaxNode; diff --git a/src/util/addDecorationsToEditor.ts b/src/util/addDecorationsToEditor.ts index 413a68541b..0038cf87f0 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,7 +15,7 @@ interface CharacterTokenInfo { } export function addDecorationsToEditors( - navigationMap: NavigationMap, + navigationMap: IndividualHatMap, decorations: Decorations ) { navigationMap.clear(); diff --git a/src/util/getExtensionApi.ts b/src/util/getExtensionApi.ts index 9091d813b5..86ac985609 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 { From 87b5e1f99e50499d3783c3f76e4fc91e0c66e456 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 14:59:53 +0000 Subject: [PATCH 10/54] Fixes to get it running --- src/core/Decorations.ts | 6 +++++- src/core/IndividualHatMap.ts | 2 +- src/extension.ts | 2 +- src/util/doTargetsRequireSnapshot.ts | 14 ++++++++------ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/core/Decorations.ts b/src/core/Decorations.ts index 8252be08a3..fc890ce4ae 100644 --- a/src/core/Decorations.ts +++ b/src/core/Decorations.ts @@ -41,7 +41,6 @@ export default class Decorations { private disposables: vscode.Disposable[] = []; constructor(private graph: Graph) { - this.constructDecorations(graph.fontMeasurements); graph.extensionContext.subscriptions.push(this); this.recomputeDecorationStyles = this.recomputeDecorationStyles.bind(this); @@ -59,6 +58,11 @@ export default class Decorations { ); } + async init() { + await this.graph.fontMeasurements.calculate(); + this.constructDecorations(this.graph.fontMeasurements); + } + registerDecorationChangeListener(listener: DecorationChangeListener) { this.decorationChangeListeners.push(listener); diff --git a/src/core/IndividualHatMap.ts b/src/core/IndividualHatMap.ts index 5c2535798e..5d563ffb03 100644 --- a/src/core/IndividualHatMap.ts +++ b/src/core/IndividualHatMap.ts @@ -9,7 +9,7 @@ export interface ReadOnlyHatMap { } export class IndividualHatMap implements ReadOnlyHatMap { - private isExpired: boolean = true; + private isExpired: boolean = false; private documentTokenLists: Map = new Map(); private deregisterFunctions: (() => void)[] = []; diff --git a/src/extension.ts b/src/extension.ts index fda491b805..f2f2f86931 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -28,8 +28,8 @@ export async function activate(context: vscode.ExtensionContext) { commandServerApi: () => commandServerApi, } as FactoryMap); graph.snippets.init(); + await graph.decorations.init(); graph.navigationMap.init(); - await graph.fontMeasurements.calculate(); const thatMark = new ThatMark(); const sourceMark = new ThatMark(); diff --git a/src/util/doTargetsRequireSnapshot.ts b/src/util/doTargetsRequireSnapshot.ts index 0715f57b0a..4863d9b595 100644 --- a/src/util/doTargetsRequireSnapshot.ts +++ b/src/util/doTargetsRequireSnapshot.ts @@ -1,13 +1,15 @@ -import { PartialTarget } from "../typings/Types"; +import { DecoratedSymbol, PartialTarget } from "../typings/Types"; import { uniq } from "lodash"; import { getPartialPrimitiveTargets } from "./targetUtils"; export function doTargetsUseSnapshot(targets: PartialTarget[]): boolean { - const snapshotIds = getPartialPrimitiveTargets(targets).map((target) => - target.mark?.type === "decoratedSymbol" - ? target.mark.useSnapshot - : undefined - ); + const snapshotIds = getPartialPrimitiveTargets(targets) + .filter((target) => target.mark?.type === "decoratedSymbol") + .map((target) => (target.mark as DecoratedSymbol).useSnapshot); + + if (snapshotIds.length === 0) { + return false; + } const uniqueSnapshotIds = uniq(snapshotIds); From b063d7cc162e5da4e6ad06b657685091ffa18a5d Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 15:00:41 +0000 Subject: [PATCH 11/54] Rename --- src/extension.ts | 2 +- src/test/suite/recorded.test.ts | 2 +- .../{doTargetsRequireSnapshot.ts => doTargetsUseSnapshot.ts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/util/{doTargetsRequireSnapshot.ts => doTargetsUseSnapshot.ts} (100%) diff --git a/src/extension.ts b/src/extension.ts index f2f2f86931..23c0392ba4 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,7 +9,7 @@ import { ThatMark } from "./core/ThatMark"; import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; -import { doTargetsUseSnapshot } from "./util/doTargetsRequireSnapshot"; +import { doTargetsUseSnapshot } from "./util/doTargetsUseSnapshot"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index 8d046c485e..75bcb73541 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -25,7 +25,7 @@ import { import { enableDebugLog } from "../../util/debug"; import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; import asyncSafety from "./asyncSafety"; -import { doTargetsUseSnapshot } from "../../util/doTargetsRequireSnapshot"; +import { doTargetsUseSnapshot } from "../../util/doTargetsUseSnapshot"; import { ReadOnlyHatMap } from "../../core/IndividualHatMap"; function createPosition(position: PositionPlainObject) { diff --git a/src/util/doTargetsRequireSnapshot.ts b/src/util/doTargetsUseSnapshot.ts similarity index 100% rename from src/util/doTargetsRequireSnapshot.ts rename to src/util/doTargetsUseSnapshot.ts From 4c71e5ea05d3bdb5b3801a537f5239bd29533c93 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 15:11:47 +0000 Subject: [PATCH 12/54] Bind function --- src/core/HatAllocator.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/HatAllocator.ts b/src/core/HatAllocator.ts index 504b435cd0..9547dc25bd 100644 --- a/src/core/HatAllocator.ts +++ b/src/core/HatAllocator.ts @@ -21,6 +21,7 @@ export class HatAllocator { .get("showOnStart")!; this.addDecorationsDebounced = this.addDecorationsDebounced.bind(this); + this.toggleDecorations = this.toggleDecorations.bind(this); this.disposableFunctions.push( graph.decorations.registerDecorationChangeListener( From 6b69e22aeb58c939b59853e3976cfea30c214b7f Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 15:13:06 +0000 Subject: [PATCH 13/54] Remove unnecessary field --- src/extension.ts | 1 - src/testUtil/TestCase.ts | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 23c0392ba4..5dc6d2e61c 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -113,7 +113,6 @@ export async function activate(context: vscode.ExtensionContext) { sourceMark, navigationMap: readableHatMap, spokenForm, - useSnapshot, }; await testCaseRecorder.preCommandHook(command, context); } diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index d0f3cae7f6..57cf55cc55 100644 --- a/src/testUtil/TestCase.ts +++ b/src/testUtil/TestCase.ts @@ -24,7 +24,6 @@ export type TestCaseContext = { sourceMark: ThatMark; targets: Target[]; navigationMap: ReadOnlyHatMap; - useSnapshot: boolean; }; export type TestCaseFixture = { @@ -75,7 +74,7 @@ export class TestCase { private getMarks() { let marks: Record; - const { navigationMap, useSnapshot } = this.context; + const { navigationMap } = this.context; if (this.isNavigationMapTest) { // If we're doing a navigation map test, then we grab the entire From 56bb24f03439e0b4c5861d0a5c88505ec966d81b Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 15:21:03 +0000 Subject: [PATCH 14/54] Add docstring --- src/core/NavigationMap.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index 64d922583f..018a3d9382 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -50,6 +50,15 @@ export default class NavigationMap { 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 useSnapshot Whether to use pre-phrase snapshot + * @returns A readable snapshot of the map + */ async getReadableMap(useSnapshot: boolean): Promise { await this.maybeTakeSnapshot(); From aeb1786e1d8bb8c1d59a8b6d20acd858d65c7d07 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 15:27:31 +0000 Subject: [PATCH 15/54] snapshot => prePhraseSnapshot --- src/core/NavigationMap.ts | 36 ++++++++-------- src/extension.ts | 7 ++-- .../recorded/navigationMap/takeHarp.yml | 42 ++++++++++++++----- src/test/suite/recorded.test.ts | 10 +++-- src/typings/Types.ts | 2 +- ...ot.ts => doTargetsUsePrePhraseSnapshot.ts} | 6 ++- 6 files changed, 66 insertions(+), 37 deletions(-) rename src/util/{doTargetsUseSnapshot.ts => doTargetsUsePrePhraseSnapshot.ts} (76%) diff --git a/src/core/NavigationMap.ts b/src/core/NavigationMap.ts index 018a3d9382..4095f4e981 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/NavigationMap.ts @@ -9,7 +9,7 @@ import { HatAllocator } from "./HatAllocator"; */ export default class NavigationMap { private activeMap: IndividualHatMap; - private mapSnapshot?: IndividualHatMap; + private prePhraseMapSnapshot?: IndividualHatMap; private phraseStartSignal: Signal | null = null; private lastSignalVersion: string | null = null; @@ -46,7 +46,7 @@ export default class NavigationMap { } private async getActiveMap() { - await this.maybeTakeSnapshot(); + await this.maybeTakePrePhraseSnapshot(); return this.activeMap; } @@ -56,28 +56,28 @@ export default class NavigationMap { * * Please do not hold onto this copy beyond the lifetime of a single command, * because it will get stale. - * @param useSnapshot Whether to use pre-phrase snapshot + * @param usePrePhraseSnapshot Whether to use pre-phrase snapshot * @returns A readable snapshot of the map */ - async getReadableMap(useSnapshot: boolean): Promise { - await this.maybeTakeSnapshot(); + async getReadableMap(usePrePhraseSnapshot: boolean): Promise { + await this.maybeTakePrePhraseSnapshot(); - if (useSnapshot) { + if (usePrePhraseSnapshot) { if (this.lastSignalVersion == null) { console.error( - "Snapshot requested but no signal was present; please upgrade command client" + "Pre phrase snapshot requested but no signal was present; please upgrade command client" ); return this.activeMap; } - if (this.mapSnapshot == null) { + if (this.prePhraseMapSnapshot == null) { console.error( - "Navigation map snapshot requested, but no snapshot has been taken" + "Navigation map pre-phrase snapshot requested, but no snapshot has been taken" ); return this.activeMap; } - return this.mapSnapshot; + return this.prePhraseMapSnapshot; } return this.activeMap; @@ -86,12 +86,12 @@ export default class NavigationMap { public dispose() { this.activeMap.dispose(); - if (this.mapSnapshot != null) { - this.mapSnapshot.dispose(); + if (this.prePhraseMapSnapshot != null) { + this.prePhraseMapSnapshot.dispose(); } } - private async maybeTakeSnapshot() { + private async maybeTakePrePhraseSnapshot() { if (this.phraseStartSignal != null) { const newSignalVersion = await this.phraseStartSignal.getVersion(); @@ -100,17 +100,17 @@ export default class NavigationMap { this.lastSignalVersion = newSignalVersion; if (newSignalVersion != null) { - this.takeSnapshot(); + this.takePrePhraseSnapshot(); } } } } - private takeSnapshot() { - if (this.mapSnapshot != null) { - this.mapSnapshot.dispose(); + private takePrePhraseSnapshot() { + if (this.prePhraseMapSnapshot != null) { + this.prePhraseMapSnapshot.dispose(); } - this.mapSnapshot = this.activeMap.clone(); + this.prePhraseMapSnapshot = this.activeMap.clone(); } } diff --git a/src/extension.ts b/src/extension.ts index 5dc6d2e61c..6fc3e56462 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,7 +9,7 @@ import { ThatMark } from "./core/ThatMark"; import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; -import { doTargetsUseSnapshot } from "./util/doTargetsUseSnapshot"; +import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); @@ -67,9 +67,10 @@ export async function activate(context: vscode.ExtensionContext) { inputExtraArgs ); - const useSnapshot = doTargetsUseSnapshot(partialTargets); + const usePrePhraseSnapshot = + doTargetsUsePrePhraseSnapshot(partialTargets); const readableHatMap = await graph.navigationMap.getReadableMap( - useSnapshot + usePrePhraseSnapshot ); console.debug(`spokenForm: ${spokenForm}`); diff --git a/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml b/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml index d936f5fc9c..ddef0b8e2d 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml +++ b/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml @@ -4,23 +4,45 @@ command: actionName: setSelection partialTargets: - type: primitive - mark: {type: decoratedSymbol, symbolColor: default, character: h, useSnapshot: true} + mark: + { + type: decoratedSymbol, + symbolColor: default, + character: h, + usePrePhraseSnapshot: true, + } extraArgs: [] initialState: documentContents: hello world selections: - - anchor: {line: 0, character: 11} - active: {line: 0, character: 11} + - anchor: { line: 0, character: 11 } + active: { line: 0, character: 11 } marks: default.h: - start: {line: 0, character: 0} - end: {line: 0, character: 5} + 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} + - 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, useSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}] + - 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/recorded.test.ts b/src/test/suite/recorded.test.ts index 75bcb73541..0952a85608 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -25,8 +25,8 @@ import { import { enableDebugLog } from "../../util/debug"; import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; import asyncSafety from "./asyncSafety"; -import { doTargetsUseSnapshot } from "../../util/doTargetsUseSnapshot"; import { ReadOnlyHatMap } from "../../core/IndividualHatMap"; +import { doTargetsUsePrePhraseSnapshot } from "../../util/doTargetsUsePrePhraseSnapshot"; function createPosition(position: PositionPlainObject) { return new vscode.Position(position.line, position.character); @@ -111,10 +111,14 @@ async function runTest(file: string) { excludeFields.push("clipboard"); } - const useSnapshot = doTargetsUseSnapshot(fixture.command.partialTargets); + const usePrePhraseSnapshot = doTargetsUsePrePhraseSnapshot( + fixture.command.partialTargets + ); // TODO: Issue the barrier if we need to - const readableHatMap = await graph.navigationMap.getReadableMap(useSnapshot); + const readableHatMap = await graph.navigationMap.getReadableMap( + usePrePhraseSnapshot + ); // Assert that recorded decorations are present checkMarks(fixture.initialState.marks, readableHatMap); diff --git a/src/typings/Types.ts b/src/typings/Types.ts index de67ff27f5..7ad5b21cd0 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -44,7 +44,7 @@ export interface DecoratedSymbol { type: "decoratedSymbol"; symbolColor: HatStyleName; character: string; - useSnapshot?: boolean; + usePrePhraseSnapshot?: boolean; } export type LineNumberType = "absolute" | "relative" | "modulo100"; diff --git a/src/util/doTargetsUseSnapshot.ts b/src/util/doTargetsUsePrePhraseSnapshot.ts similarity index 76% rename from src/util/doTargetsUseSnapshot.ts rename to src/util/doTargetsUsePrePhraseSnapshot.ts index 4863d9b595..bb7b8cd1a2 100644 --- a/src/util/doTargetsUseSnapshot.ts +++ b/src/util/doTargetsUsePrePhraseSnapshot.ts @@ -2,10 +2,12 @@ import { DecoratedSymbol, PartialTarget } from "../typings/Types"; import { uniq } from "lodash"; import { getPartialPrimitiveTargets } from "./targetUtils"; -export function doTargetsUseSnapshot(targets: PartialTarget[]): boolean { +export function doTargetsUsePrePhraseSnapshot( + targets: PartialTarget[] +): boolean { const snapshotIds = getPartialPrimitiveTargets(targets) .filter((target) => target.mark?.type === "decoratedSymbol") - .map((target) => (target.mark as DecoratedSymbol).useSnapshot); + .map((target) => (target.mark as DecoratedSymbol).usePrePhraseSnapshot); if (snapshotIds.length === 0) { return false; From 55ce1c4aa11e88a1a3f76546f8c4d3b26eaf52ab Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 15:30:29 +0000 Subject: [PATCH 16/54] Clean yaml --- .../recorded/navigationMap/takeHarp.yml | 42 +++++-------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml b/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml index ddef0b8e2d..75524d1a6e 100644 --- a/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml +++ b/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml @@ -4,45 +4,23 @@ command: actionName: setSelection partialTargets: - type: primitive - mark: - { - type: decoratedSymbol, - symbolColor: default, - character: h, - usePrePhraseSnapshot: true, - } + mark: {type: decoratedSymbol, symbolColor: default, character: h, usePrePhraseSnapshot: true} extraArgs: [] initialState: documentContents: hello world selections: - - anchor: { line: 0, character: 11 } - active: { line: 0, character: 11 } + - anchor: {line: 0, character: 11} + active: {line: 0, character: 11} marks: default.h: - start: { line: 0, character: 0 } - end: { line: 0, character: 5 } + 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 } + - 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 }, - }, - ] + - 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}}] From 759aa3c975d32145a4604b078262e8b8465886ce Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 16:01:22 +0000 Subject: [PATCH 17/54] Do disposal in hat allocator --- src/core/HatAllocator.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/HatAllocator.ts b/src/core/HatAllocator.ts index 9547dc25bd..b9c47c5b6f 100644 --- a/src/core/HatAllocator.ts +++ b/src/core/HatAllocator.ts @@ -13,9 +13,11 @@ export class HatAllocator { private timeoutHandle: NodeJS.Timeout | null = null; private isActive: boolean; private disposables: Disposable[] = []; - private disposableFunctions: (() => void)[] = []; + private disposalFunctions: (() => void)[] = []; constructor(private graph: Graph, private context: Context) { + graph.extensionContext.subscriptions.push(this); + this.isActive = vscode.workspace .getConfiguration("cursorless") .get("showOnStart")!; @@ -23,7 +25,7 @@ export class HatAllocator { this.addDecorationsDebounced = this.addDecorationsDebounced.bind(this); this.toggleDecorations = this.toggleDecorations.bind(this); - this.disposableFunctions.push( + this.disposalFunctions.push( graph.decorations.registerDecorationChangeListener( this.addDecorationsDebounced ) @@ -83,7 +85,7 @@ export class HatAllocator { dispose() { this.disposables.forEach(({ dispose }) => dispose()); - this.disposableFunctions.forEach((dispose) => dispose()); + this.disposalFunctions.forEach((dispose) => dispose()); if (this.timeoutHandle != null) { clearTimeout(this.timeoutHandle); From 0b1b9abf87bc75bf1edc9f9e83a0cf0e4ac7734a Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 16:04:43 +0000 Subject: [PATCH 18/54] navigationMap => hatTokenMap --- src/core/{NavigationMap.ts => HatTokenMap.ts} | 2 +- src/core/IndividualHatMap.ts | 6 +++--- src/extension.ts | 14 +++++++------- src/processTargets/processMark.ts | 2 +- .../bringAirToThirdCarWhaleTakeWhale.yml | 0 .../bringCommaToEndOfPointTakePoint.yml | 0 .../bringCommaToStartOfPointTakePoint.yml | 0 .../bringHarpAfterWhaleTakeWhale.yml | 0 ...dPointToEndOfThisAndEndOfWhaleTakeWhale.yml | 0 ...pAndPointToThisAndStartOfWhaleTakeWhale.yml | 0 .../bringHarpBeforeWhaleTakeWhale.yml | 0 .../bringHarpTakeWhale.yml | 0 .../bringHarpToEndOfPointTakePoint.yml | 0 .../bringHarpToStartOfPointTakePoint.yml | 0 .../bringHarpToStartOfWhaleTakeWhale.yml | 0 .../bringPointAfterFirstCarWhaleTakeWhale.yml | 0 ...dOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml | 0 ...ingPointAndHarpToEndOfThisAndEndOfWhale.yml | 0 ...ndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml | 0 ...fSecondCarWhaleAndStartOfWhaleTakeWhale.yml | 0 ...ntAndHarpToThisAndStartOfWhaleTakeWhale.yml | 0 ...dOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml | 0 ...fSecondCarWhaleAndStartOfWhaleTakeWhale.yml | 0 .../bringPointToEndOfWhaleTakeWhale.yml | 0 .../bringPointToStartOfWhaleTakeWhale.yml | 0 .../bringPointToThirdCarWhaleTakeWhale.yml | 0 .../chuckFirstTwoCarWhaleTakeWhale.yml | 0 ...kFourthCarWhalePastThirdCarAirTakeWhale.yml | 0 .../chuckHarpPastAirTakeWhale.yml | 0 .../chuckLastTwoCarWhaleTakeWhale.yml | 0 .../chuckSecondPastThirdCarWhaleTakeWhale.yml | 0 ...ThirdCarHarpPastSecondCarWhaleTakeWhale.yml | 0 ...PastSecondCarWhaleToEndOfWhaleTakeWhale.yml | 0 .../takeHarp.yml | 0 src/test/suite/recorded.test.ts | 10 +++++----- src/testUtil/TestCase.ts | 18 +++++++++--------- src/testUtil/TestCaseRecorder.ts | 8 ++++---- src/testUtil/extractTargetedMarks.ts | 10 +++++----- src/typings/Types.ts | 6 +++--- src/util/addDecorationsToEditor.ts | 6 +++--- src/util/graphFactories.ts | 4 ++-- 41 files changed, 43 insertions(+), 43 deletions(-) rename src/core/{NavigationMap.ts => HatTokenMap.ts} (98%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringAirToThirdCarWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringCommaToEndOfPointTakePoint.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringCommaToStartOfPointTakePoint.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpAfterWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpBeforeWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpToEndOfPointTakePoint.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpToStartOfPointTakePoint.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringHarpToStartOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAfterFirstCarWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAndHarpToEndOfThisAndEndOfWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointToEndOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointToStartOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/bringPointToThirdCarWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/chuckFirstTwoCarWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/chuckHarpPastAirTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/chuckLastTwoCarWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/chuckSecondPastThirdCarWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml (100%) rename src/test/suite/fixtures/recorded/{navigationMap => hatTokenMap}/takeHarp.yml (100%) diff --git a/src/core/NavigationMap.ts b/src/core/HatTokenMap.ts similarity index 98% rename from src/core/NavigationMap.ts rename to src/core/HatTokenMap.ts index 4095f4e981..bc4a722de3 100644 --- a/src/core/NavigationMap.ts +++ b/src/core/HatTokenMap.ts @@ -7,7 +7,7 @@ import { HatAllocator } from "./HatAllocator"; /** * Maps from (hatStyle, character) pairs to tokens */ -export default class NavigationMap { +export default class HatTokenMap { private activeMap: IndividualHatMap; private prePhraseMapSnapshot?: IndividualHatMap; diff --git a/src/core/IndividualHatMap.ts b/src/core/IndividualHatMap.ts index 5d563ffb03..c506cfef25 100644 --- a/src/core/IndividualHatMap.ts +++ b/src/core/IndividualHatMap.ts @@ -1,7 +1,7 @@ import { TextDocument } from "vscode"; import { HatStyleName } from "./constants"; import { Graph, Token } from "../typings/Types"; -import NavigationMap from "./NavigationMap"; +import HatTokenMap from "./HatTokenMap"; export interface ReadOnlyHatMap { getEntries(): [string, Token][]; @@ -55,12 +55,12 @@ export class IndividualHatMap implements ReadOnlyHatMap { } addToken(hatStyle: HatStyleName, character: string, token: Token) { - this.addTokenByKey(NavigationMap.getKey(hatStyle, character), token); + this.addTokenByKey(HatTokenMap.getKey(hatStyle, character), token); } getToken(hatStyle: HatStyleName, character: string) { this.checkExpired(); - return this.map[NavigationMap.getKey(hatStyle, character)]; + return this.map[HatTokenMap.getKey(hatStyle, character)]; } clear() { diff --git a/src/extension.ts b/src/extension.ts index 6fc3e56462..7dd66ae408 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -29,7 +29,7 @@ export async function activate(context: vscode.ExtensionContext) { } as FactoryMap); graph.snippets.init(); await graph.decorations.init(); - graph.navigationMap.init(); + graph.hatTokenMap.init(); const thatMark = new ThatMark(); const sourceMark = new ThatMark(); @@ -37,12 +37,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}` ); @@ -69,7 +69,7 @@ export async function activate(context: vscode.ExtensionContext) { const usePrePhraseSnapshot = doTargetsUsePrePhraseSnapshot(partialTargets); - const readableHatMap = await graph.navigationMap.getReadableMap( + const readableHatMap = await graph.hatTokenMap.getReadableMap( usePrePhraseSnapshot ); @@ -98,7 +98,7 @@ export async function activate(context: vscode.ExtensionContext) { editor: vscode.window.activeTextEditor!, })) ?? [], currentEditor: vscode.window.activeTextEditor, - navigationMap: readableHatMap, + hatTokenMap: readableHatMap, thatMark: thatMark.exists() ? thatMark.get() : [], sourceMark: sourceMark.exists() ? sourceMark.get() : [], getNodeAtLocation, @@ -112,7 +112,7 @@ export async function activate(context: vscode.ExtensionContext) { targets, thatMark, sourceMark, - navigationMap: readableHatMap, + hatTokenMap: readableHatMap, spokenForm, }; await testCaseRecorder.preCommandHook(command, context); @@ -154,7 +154,7 @@ export async function activate(context: vscode.ExtensionContext) { // { flag: "a" } // ); - // const processedTargets = processTargets(navigationMap!, targets); + // const processedTargets = processTargets(hatTokenMap!, targets); } catch (e) { testCaseRecorder.commandErrorHook(); const err = e as Error; 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/test/suite/fixtures/recorded/navigationMap/bringAirToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringAirToThirdCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringCommaToEndOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringCommaToStartOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAfterWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpAfterWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpBeforeWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpBeforeWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpToEndOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfPointTakePoint.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAfterFirstCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAfterFirstCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointToEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointToStartOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/bringPointToThirdCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckFirstTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/chuckFirstTwoCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckHarpPastAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/chuckHarpPastAirTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckLastTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/chuckLastTwoCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckSecondPastThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/chuckSecondPastThirdCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml diff --git a/src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml b/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml similarity index 100% rename from src/test/suite/fixtures/recorded/navigationMap/takeHarp.yml rename to src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index 0952a85608..95adff633c 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"; @@ -116,7 +116,7 @@ async function runTest(file: string) { ); // TODO: Issue the barrier if we need to - const readableHatMap = await graph.navigationMap.getReadableMap( + const readableHatMap = await graph.hatTokenMap.getReadableMap( usePrePhraseSnapshot ); @@ -170,15 +170,15 @@ async function runTest(file: string) { function checkMarks( marks: SerializedMarks | undefined, - navigationMap: ReadOnlyHatMap + 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/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index 57cf55cc55..19b6d283d2 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 { @@ -23,7 +23,7 @@ export type TestCaseContext = { thatMark: ThatMark; sourceMark: ThatMark; targets: Target[]; - navigationMap: ReadOnlyHatMap; + hatTokenMap: ReadOnlyHatMap; }; export type TestCaseFixture = { @@ -57,7 +57,7 @@ export class TestCase { constructor( private command: TestCaseCommand, private context: TestCaseContext, - private isNavigationMapTest: boolean = false + private isHatTokenMapTest: boolean = false ) { const activeEditor = vscode.window.activeTextEditor!; @@ -68,21 +68,21 @@ export class TestCase { 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); @@ -164,7 +164,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..07abdea8f1 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(); } } diff --git a/src/testUtil/extractTargetedMarks.ts b/src/testUtil/extractTargetedMarks.ts index f21824d88a..4288422124 100644 --- a/src/testUtil/extractTargetedMarks.ts +++ b/src/testUtil/extractTargetedMarks.ts @@ -1,6 +1,6 @@ import { HatStyleName } from "../core/constants"; import { ReadOnlyHatMap } from "../core/IndividualHatMap"; -import NavigationMap from "../core/NavigationMap"; +import HatTokenMap from "../core/HatTokenMap"; import { PrimitiveTarget, Target, Token } from "../typings/Types"; function extractPrimitiveTargetKeys(...targets: PrimitiveTarget[]) { @@ -8,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; @@ -32,13 +32,13 @@ export function extractTargetKeys(target: Target): string[] { export function extractTargetedMarks( targetKeys: string[], - navigationMap: ReadOnlyHatMap + 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/typings/Types.ts b/src/typings/Types.ts index 7ad5b21cd0..ea012157d0 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -3,7 +3,7 @@ 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"; @@ -235,7 +235,7 @@ export type Target = PrimitiveTarget | RangeTarget | ListTarget; export interface ProcessedTargetsContext { currentSelections: SelectionWithEditor[]; currentEditor: vscode.TextEditor | undefined; - navigationMap: ReadOnlyHatMap; + hatTokenMap: ReadOnlyHatMap; thatMark: SelectionWithEditor[]; sourceMark: SelectionWithEditor[]; getNodeAtLocation: (location: Location) => SyntaxNode; @@ -372,7 +372,7 @@ export interface Graph { /** * Keeps a map of all decorated marks */ - readonly navigationMap: NavigationMap; + readonly hatTokenMap: HatTokenMap; /** * The extension context passed in during extension activation diff --git a/src/util/addDecorationsToEditor.ts b/src/util/addDecorationsToEditor.ts index 0038cf87f0..c5478f7963 100644 --- a/src/util/addDecorationsToEditor.ts +++ b/src/util/addDecorationsToEditor.ts @@ -15,10 +15,10 @@ interface CharacterTokenInfo { } export function addDecorationsToEditors( - navigationMap: IndividualHatMap, + 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/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, From 94bb3d84c183518c5b0794fb74b9ce1a50e88b8d Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 20:01:02 +0000 Subject: [PATCH 19/54] Add tests --- src/core/HatTokenMap.ts | 14 ++- src/core/constants.ts | 2 + src/extension.ts | 3 +- src/test/suite/prePhraseSnapshot.test.ts | 111 +++++++++++++++++++++++ src/test/suite/recorded.test.ts | 18 +++- src/util/editDisplayUtils.ts | 3 +- src/util/makeGraph.ts | 3 + 7 files changed, 145 insertions(+), 9 deletions(-) create mode 100644 src/test/suite/prePhraseSnapshot.test.ts diff --git a/src/core/HatTokenMap.ts b/src/core/HatTokenMap.ts index bc4a722de3..4a0b0ebada 100644 --- a/src/core/HatTokenMap.ts +++ b/src/core/HatTokenMap.ts @@ -11,14 +11,12 @@ export default class HatTokenMap { private activeMap: IndividualHatMap; private prePhraseMapSnapshot?: IndividualHatMap; - private phraseStartSignal: Signal | 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.phraseStartSignal = graph.commandServerApi?.signals.prePhrase ?? null; this.getActiveMap = this.getActiveMap.bind(this); @@ -28,7 +26,11 @@ export default class HatTokenMap { } init() { - this.hatAllocator.addDecorations(); + return this.hatAllocator.addDecorations(); + } + + addDecorations() { + return this.hatAllocator.addDecorations(); } static getKey(hatStyle: HatStyleName, character: string) { @@ -92,8 +94,10 @@ export default class HatTokenMap { } private async maybeTakePrePhraseSnapshot() { - if (this.phraseStartSignal != null) { - const newSignalVersion = await this.phraseStartSignal.getVersion(); + const phraseStartSignal = this.graph.commandServerApi?.signals.prePhrase; + + if (phraseStartSignal != null) { + const newSignalVersion = await phraseStartSignal.getVersion(); if (newSignalVersion !== this.lastSignalVersion) { console.debug("taking snapshot"); diff --git a/src/core/constants.ts b/src/core/constants.ts index 9dbd446e49..293735776a 100644 --- a/src/core/constants.ts +++ b/src/core/constants.ts @@ -1,3 +1,5 @@ +export const IS_TESTING = process.env.CURSORLESS_TEST != null; + export const SUBWORD_MATCHER = /[A-Z]?[a-z]+|[A-Z]+(?![a-z])|[0-9]+/g; export const DECORATION_DEBOUNCE_DELAY = 175; diff --git a/src/extension.ts b/src/extension.ts index 7dd66ae408..83ca626312 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -10,6 +10,7 @@ import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; +import { IS_TESTING } from "./core/constants"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); @@ -204,7 +205,7 @@ export async function activate(context: vscode.ExtensionContext) { return { thatMark, sourceMark, - graph: process.env.CURSORLESS_TEST == null ? undefined : graph, + graph: IS_TESTING ? graph : undefined, experimental: { registerThirdPartySnippets: graph.snippets.registerThirdPartySnippets, }, diff --git a/src/test/suite/prePhraseSnapshot.test.ts b/src/test/suite/prePhraseSnapshot.test.ts new file mode 100644 index 0000000000..1dfce7e877 --- /dev/null +++ b/src/test/suite/prePhraseSnapshot.test.ts @@ -0,0 +1,111 @@ +import * as assert from "assert"; +import * as vscode from "vscode"; +import * as sinon from "sinon"; +import { getCursorlessApi, Signal } from "../../util/getExtensionApi"; +import { selectionToPlainObject } from "../../testUtil/toPlainObject"; + +/** + * 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 initialContent = "Hello world testing whatever"; + + const graph = (await getCursorlessApi()).graph!; + + await vscode.commands.executeCommand("workbench.action.closeAllEditors"); + const document = await vscode.workspace.openTextDocument({ + language: "plaintext", + content: initialContent, + }); + const editor = await vscode.window.showTextDocument(document); + + editor.selections = [new vscode.Selection(0, 0, 0, 0)]; + + await graph.hatTokenMap.addDecorations(); + + let prePhraseVersion = "version"; + + sinon.replaceGetter(graph, "commandServerApi", () => ({ + signals: { + getNamedSignal(name: string) { + return {} as Signal; + }, + prePhrase: { + getVersion: async () => prePhraseVersion, + } as Signal, + }, + })); + + await vscode.commands.executeCommand( + "cursorless.command", + "whatever", + "replaceWithTarget", + [ + { 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 = "version2"; + } + + await vscode.commands.executeCommand( + "cursorless.command", + "whatever", + "setSelection", + [ + { + 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 95adff633c..9ee83b11b9 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -18,9 +18,9 @@ import { } from "../../testUtil/toPlainObject"; import { walkFilesSync } from "../../testUtil/walkSync"; import { - CursorlessApi, getCursorlessApi, getParseTreeApi, + Signal, } from "../../util/getExtensionApi"; import { enableDebugLog } from "../../util/debug"; import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; @@ -111,10 +111,24 @@ async function runTest(file: string) { excludeFields.push("clipboard"); } + await graph.hatTokenMap.addDecorations(); + const usePrePhraseSnapshot = doTargetsUsePrePhraseSnapshot( fixture.command.partialTargets ); - // TODO: Issue the barrier if we need to + + if (usePrePhraseSnapshot) { + sinon.replaceGetter(graph, "commandServerApi", () => ({ + signals: { + getNamedSignal(name: string) { + return {} as Signal; + }, + prePhrase: { + getVersion: async () => "version", + } as Signal, + }, + })); + } const readableHatMap = await graph.hatTokenMap.getReadableMap( usePrePhraseSnapshot diff --git a/src/util/editDisplayUtils.ts b/src/util/editDisplayUtils.ts index 4dc3f888a4..e222628031 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 { IS_TESTING } from "../core/constants"; const sleep = promisify(setTimeout); @@ -13,7 +14,7 @@ const getPendingEditDecorationTime = () => .get("pendingEditDecorationTime")!; export async function decorationSleep() { - if (process.env.CURSORLESS_TEST != null) { + if (IS_TESTING) { return; } diff --git a/src/util/makeGraph.ts b/src/util/makeGraph.ts index 202845b9aa..5296479155 100644 --- a/src/util/makeGraph.ts +++ b/src/util/makeGraph.ts @@ -1,3 +1,5 @@ +import { IS_TESTING } from "../core/constants"; + export type FactoryMap = { [P in keyof T]: (t: T) => T[P]; }; @@ -37,6 +39,7 @@ export default function makeGraph( factoryMap, key as keyof GraphType ), + configurable: IS_TESTING, }); }); From f1c60ee238fe936d91800774ac92d5f6381bba03 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 20:14:28 +0000 Subject: [PATCH 20/54] Make isTesting into function --- src/core/constants.ts | 2 -- src/extension.ts | 4 ++-- src/testUtil/isTesting.ts | 3 +++ src/util/editDisplayUtils.ts | 4 ++-- src/util/makeGraph.ts | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 src/testUtil/isTesting.ts diff --git a/src/core/constants.ts b/src/core/constants.ts index 293735776a..9dbd446e49 100644 --- a/src/core/constants.ts +++ b/src/core/constants.ts @@ -1,5 +1,3 @@ -export const IS_TESTING = process.env.CURSORLESS_TEST != null; - export const SUBWORD_MATCHER = /[A-Z]?[a-z]+|[A-Z]+(?![a-z])|[0-9]+/g; export const DECORATION_DEBOUNCE_DELAY = 175; diff --git a/src/extension.ts b/src/extension.ts index 83ca626312..d745ce3f8f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -10,7 +10,7 @@ import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; -import { IS_TESTING } from "./core/constants"; +import isTesting from "./testUtil/isTesting"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); @@ -205,7 +205,7 @@ export async function activate(context: vscode.ExtensionContext) { return { thatMark, sourceMark, - graph: IS_TESTING ? graph : undefined, + graph: isTesting() ? graph : undefined, experimental: { registerThirdPartySnippets: graph.snippets.registerThirdPartySnippets, }, 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/util/editDisplayUtils.ts b/src/util/editDisplayUtils.ts index e222628031..ef55105d5e 100644 --- a/src/util/editDisplayUtils.ts +++ b/src/util/editDisplayUtils.ts @@ -4,7 +4,7 @@ import { isLineSelectionType } from "./selectionType"; import { promisify } from "util"; import { runOnTargetsForEachEditor, runForEachEditor } from "./targetUtils"; import { EditStyle } from "../core/editStyles"; -import { IS_TESTING } from "../core/constants"; +import isTesting from "../testUtil/isTesting"; const sleep = promisify(setTimeout); @@ -14,7 +14,7 @@ const getPendingEditDecorationTime = () => .get("pendingEditDecorationTime")!; export async function decorationSleep() { - if (IS_TESTING) { + if (isTesting()) { return; } diff --git a/src/util/makeGraph.ts b/src/util/makeGraph.ts index 5296479155..12240938e6 100644 --- a/src/util/makeGraph.ts +++ b/src/util/makeGraph.ts @@ -1,4 +1,4 @@ -import { IS_TESTING } from "../core/constants"; +import isTesting from "../testUtil/isTesting"; export type FactoryMap = { [P in keyof T]: (t: T) => T[P]; @@ -39,7 +39,7 @@ export default function makeGraph( factoryMap, key as keyof GraphType ), - configurable: IS_TESTING, + configurable: isTesting(), }); }); From ac4df71fa2c663943471513a320b70992bfa2cee Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 20:16:46 +0000 Subject: [PATCH 21/54] Set testing env var --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b259713c2d..7ad3389fdc 100644 --- a/package.json +++ b/package.json @@ -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": "CURSORLESS_TEST=true node ./out/test/runTest.js" }, "devDependencies": { "@types/glob": "^7.1.3", From ea5760d2fad157dc020944eebab6d5c72ee35ac8 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 9 Nov 2021 20:18:45 +0000 Subject: [PATCH 22/54] Try to change env var --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ad3389fdc..a1ff07d2df 100644 --- a/package.json +++ b/package.json @@ -427,7 +427,7 @@ "watch": "tsc -watch -p ./", "pretest": "yarn run compile && yarn run lint && yarn run esbuild", "lint": "eslint src --ext ts", - "test": "CURSORLESS_TEST=true node ./out/test/runTest.js" + "test": "env CURSORLESS_TEST=true node ./out/test/runTest.js" }, "devDependencies": { "@types/glob": "^7.1.3", From 5e98e7f31445ce92561a893c3bc29c3b87fd316d Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Wed, 10 Nov 2021 13:08:45 +0000 Subject: [PATCH 23/54] Initial cleanup work for edits outside viewport --- package.json | 2 +- src/extension.ts | 54 +++++++++++++++++++++++++++++++----------------- yarn.lock | 8 +++---- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index a1ff07d2df..452fafaab7 100644 --- a/package.json +++ b/package.json @@ -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/extension.ts b/src/extension.ts index d745ce3f8f..9702c1af7a 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -16,13 +16,6 @@ export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); const commandServerApi = await getCommandServerApi(); - function handleEdit(edit: vscode.TextDocumentChangeEvent) { - // TODO. Disabled for now because it triggers on undo as well - // wait until next release when there is a cause field - // checkForEditsOutsideViewport(edit); - } - // vscode.workspace.onDidChangeTextDocument(handleEdit) - const graph = makeGraph({ ...graphFactories, extensionContext: () => context, @@ -167,22 +160,45 @@ export async function activate(context: vscode.ExtensionContext) { } ); + function handleEdit(edit: vscode.TextDocumentChangeEvent) { + // TODO. Disabled for now because it triggers on undo as well + // wait until next release when there is a cause field + // checkForEditsOutsideViewport(edit); + } + + // vscode.workspace.onDidChangeTextDocument(handleEdit) + 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. + // See https://github.com/pokey/cursorless-vscode/issues/320 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 diff --git a/yarn.lock b/yarn.lock index 51a863035f..5ac3bf06d2 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.62.0": + version "1.61.0" + resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.61.0.tgz#c54335b6f84c19c69b1435b17cc0ce3b2cecfeec" + integrity sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg== "@typescript-eslint/eslint-plugin@^4.9.0": version "4.15.0" From 1717decdb9a00b6ef3d481af7b269f56d898dbbf Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Wed, 10 Nov 2021 13:10:04 +0000 Subject: [PATCH 24/54] More cleanup --- src/extension.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 9702c1af7a..21a60a2426 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -160,14 +160,9 @@ export async function activate(context: vscode.ExtensionContext) { } ); - function handleEdit(edit: vscode.TextDocumentChangeEvent) { - // TODO. Disabled for now because it triggers on undo as well - // wait until next release when there is a cause field - // checkForEditsOutsideViewport(edit); - } - - // vscode.workspace.onDidChangeTextDocument(handleEdit) - + // 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 @@ -177,7 +172,6 @@ export async function activate(context: vscode.ExtensionContext) { // 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. - // See https://github.com/pokey/cursorless-vscode/issues/320 const editor = vscode.window.activeTextEditor; if ( From e5c80eee33ebda068692534c2b1f13bab68e9335 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Wed, 10 Nov 2021 13:15:21 +0000 Subject: [PATCH 25/54] Fix yarn lockfile --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5ac3bf06d2..6d676e7961 100644 --- a/yarn.lock +++ b/yarn.lock @@ -143,10 +143,10 @@ dependencies: "@sinonjs/fake-timers" "^7.1.0" -"@types/vscode@<1.62.0": - version "1.61.0" - resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.61.0.tgz#c54335b6f84c19c69b1435b17cc0ce3b2cecfeec" - integrity sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg== +"@types/vscode@^1.61.0": + version "1.62.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" From ddd302287c86c9f0c54a5dd9339e569a1827c63e Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Wed, 10 Nov 2021 13:21:17 +0000 Subject: [PATCH 26/54] Fix yarn --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 452fafaab7..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" diff --git a/yarn.lock b/yarn.lock index 6d676e7961..99bc1631a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -144,7 +144,7 @@ "@sinonjs/fake-timers" "^7.1.0" "@types/vscode@^1.61.0": - version "1.62.0" + version "1.61.0" resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.62.0.tgz#b4d6d192d5aeb75e91d0adef689c3ecef9879da7" integrity sha512-iGlQJ1w5e3qPUryroO6v4lxg3ql1ztdTCwQW3xEwFawdyPLoeUSv48SYfMwc7kQA7h6ThUqflZIjgKAykeF9oA== From fc4dd8c1d90284d6ab6279a6f7b8932909eae7f7 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Wed, 10 Nov 2021 20:20:16 +0000 Subject: [PATCH 27/54] refactoring --- src/test/mockPrePhraseGetVersion.ts | 19 +++++++++++++++++++ src/test/suite/prePhraseSnapshot.test.ts | 14 +++----------- src/test/suite/recorded.test.ts | 12 ++---------- 3 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 src/test/mockPrePhraseGetVersion.ts diff --git a/src/test/mockPrePhraseGetVersion.ts b/src/test/mockPrePhraseGetVersion.ts new file mode 100644 index 0000000000..6ecbcc5ee2 --- /dev/null +++ b/src/test/mockPrePhraseGetVersion.ts @@ -0,0 +1,19 @@ +import * as sinon from "sinon"; +import { Signal } from "../util/getExtensionApi"; +import { Graph } from "../typings/Types"; + +export function mockPrePhraseGetVersion( + graph: Graph, + getVersion: () => Promise +) { + sinon.replaceGetter(graph, "commandServerApi", () => ({ + signals: { + getNamedSignal(name: string) { + return {} as Signal; + }, + prePhrase: { + getVersion, + } as Signal, + }, + })); +} diff --git a/src/test/suite/prePhraseSnapshot.test.ts b/src/test/suite/prePhraseSnapshot.test.ts index 1dfce7e877..ceee49f93c 100644 --- a/src/test/suite/prePhraseSnapshot.test.ts +++ b/src/test/suite/prePhraseSnapshot.test.ts @@ -1,8 +1,9 @@ import * as assert from "assert"; import * as vscode from "vscode"; import * as sinon from "sinon"; -import { getCursorlessApi, Signal } from "../../util/getExtensionApi"; +import { getCursorlessApi } from "../../util/getExtensionApi"; import { selectionToPlainObject } from "../../testUtil/toPlainObject"; +import { mockPrePhraseGetVersion } from "../mockPrePhraseGetVersion"; /** * The selections we expect when the pre-phrase snapshot is used @@ -55,16 +56,7 @@ async function runTest( let prePhraseVersion = "version"; - sinon.replaceGetter(graph, "commandServerApi", () => ({ - signals: { - getNamedSignal(name: string) { - return {} as Signal; - }, - prePhrase: { - getVersion: async () => prePhraseVersion, - } as Signal, - }, - })); + mockPrePhraseGetVersion(graph, async () => prePhraseVersion); await vscode.commands.executeCommand( "cursorless.command", diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index 9ee83b11b9..ea2bf51822 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -27,6 +27,7 @@ import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; import asyncSafety from "./asyncSafety"; import { ReadOnlyHatMap } from "../../core/IndividualHatMap"; import { doTargetsUsePrePhraseSnapshot } from "../../util/doTargetsUsePrePhraseSnapshot"; +import { mockPrePhraseGetVersion } from "../mockPrePhraseGetVersion"; function createPosition(position: PositionPlainObject) { return new vscode.Position(position.line, position.character); @@ -118,16 +119,7 @@ async function runTest(file: string) { ); if (usePrePhraseSnapshot) { - sinon.replaceGetter(graph, "commandServerApi", () => ({ - signals: { - getNamedSignal(name: string) { - return {} as Signal; - }, - prePhrase: { - getVersion: async () => "version", - } as Signal, - }, - })); + mockPrePhraseGetVersion(graph, async () => "version"); } const readableHatMap = await graph.hatTokenMap.getReadableMap( From 8a7ae4b9bd72cd70ec3f8ea561fcf18c86610a39 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Fri, 12 Nov 2021 11:10:06 +0000 Subject: [PATCH 28/54] Fixes; add tests --- src/core/HatAllocator.ts | 1 + src/core/HatTokenMap.ts | 1 - src/test/mockPrePhraseGetVersion.ts | 6 +--- src/test/openNewEditor.ts | 18 ++++++++++++ src/test/suite/prePhraseSnapshot.test.ts | 10 ++----- src/test/suite/recorded.test.ts | 20 ++++--------- src/test/suite/toggleDecorations.test.ts | 36 ++++++++++++++++++++++++ src/util/getExtensionApi.ts | 5 ++-- 8 files changed, 66 insertions(+), 31 deletions(-) create mode 100644 src/test/openNewEditor.ts create mode 100644 src/test/suite/toggleDecorations.test.ts diff --git a/src/core/HatAllocator.ts b/src/core/HatAllocator.ts index b9c47c5b6f..f623731f49 100644 --- a/src/core/HatAllocator.ts +++ b/src/core/HatAllocator.ts @@ -24,6 +24,7 @@ export class HatAllocator { this.addDecorationsDebounced = this.addDecorationsDebounced.bind(this); this.toggleDecorations = this.toggleDecorations.bind(this); + this.clearEditorDecorations = this.clearEditorDecorations.bind(this); this.disposalFunctions.push( graph.decorations.registerDecorationChangeListener( diff --git a/src/core/HatTokenMap.ts b/src/core/HatTokenMap.ts index 4a0b0ebada..44ed544bc2 100644 --- a/src/core/HatTokenMap.ts +++ b/src/core/HatTokenMap.ts @@ -1,6 +1,5 @@ import { HatStyleName } from "./constants"; import { Graph } from "../typings/Types"; -import { Signal } from "../util/getExtensionApi"; import { IndividualHatMap, ReadOnlyHatMap } from "./IndividualHatMap"; import { HatAllocator } from "./HatAllocator"; diff --git a/src/test/mockPrePhraseGetVersion.ts b/src/test/mockPrePhraseGetVersion.ts index 6ecbcc5ee2..fc9894f3e8 100644 --- a/src/test/mockPrePhraseGetVersion.ts +++ b/src/test/mockPrePhraseGetVersion.ts @@ -1,5 +1,4 @@ import * as sinon from "sinon"; -import { Signal } from "../util/getExtensionApi"; import { Graph } from "../typings/Types"; export function mockPrePhraseGetVersion( @@ -8,12 +7,9 @@ export function mockPrePhraseGetVersion( ) { sinon.replaceGetter(graph, "commandServerApi", () => ({ signals: { - getNamedSignal(name: string) { - return {} as Signal; - }, prePhrase: { getVersion, - } as Signal, + }, }, })); } 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/prePhraseSnapshot.test.ts b/src/test/suite/prePhraseSnapshot.test.ts index ceee49f93c..108d1fc266 100644 --- a/src/test/suite/prePhraseSnapshot.test.ts +++ b/src/test/suite/prePhraseSnapshot.test.ts @@ -4,6 +4,7 @@ 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 @@ -39,16 +40,9 @@ async function runTest( multiplePhrases: boolean, expectedSelections: vscode.Selection[] ) { - const initialContent = "Hello world testing whatever"; - const graph = (await getCursorlessApi()).graph!; - await vscode.commands.executeCommand("workbench.action.closeAllEditors"); - const document = await vscode.workspace.openTextDocument({ - language: "plaintext", - content: initialContent, - }); - const editor = await vscode.window.showTextDocument(document); + const editor = await openNewEditor("Hello world testing whatever"); editor.selections = [new vscode.Selection(0, 0, 0, 0)]; diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index ea2bf51822..e9bdd22435 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -17,17 +17,14 @@ import { SerializedMarks, } from "../../testUtil/toPlainObject"; import { walkFilesSync } from "../../testUtil/walkSync"; -import { - getCursorlessApi, - getParseTreeApi, - Signal, -} 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 { doTargetsUsePrePhraseSnapshot } from "../../util/doTargetsUsePrePhraseSnapshot"; import { mockPrePhraseGetVersion } from "../mockPrePhraseGetVersion"; +import { openNewEditor } from "../openNewEditor"; function createPosition(position: PositionPlainObject) { return new vscode.Position(position.line, position.character); @@ -67,15 +64,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) => { @@ -83,8 +77,6 @@ async function runTest(file: string) { }); } - await parseTreeApi.loadLanguage(document.languageId); - editor.selections = fixture.initialState.selections.map(createSelection); if (fixture.initialState.thatMark) { 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/util/getExtensionApi.ts b/src/util/getExtensionApi.ts index 86ac985609..f2aea6d43e 100644 --- a/src/util/getExtensionApi.ts +++ b/src/util/getExtensionApi.ts @@ -18,14 +18,13 @@ export interface ParseTreeApi { loadLanguage: (languageId: string) => Promise; } -export interface Signal { +export interface InboundSignal { getVersion(): Promise; } export interface CommandServerApi { signals: { - getNamedSignal: (name: string) => Signal; - prePhrase: Signal; + prePhrase: InboundSignal; }; } From f2c2e11c2aa301b066f95a877f7824c6ef777048 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Fri, 12 Nov 2021 11:33:31 +0000 Subject: [PATCH 29/54] File rename --- .../fixtures/{constants.fixture.ts => subtoken.fixture.ts} | 4 ++-- src/test/suite/{constants.test.ts => subtoken.test.ts} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/test/suite/fixtures/{constants.fixture.ts => subtoken.fixture.ts} (96%) rename src/test/suite/{constants.test.ts => subtoken.test.ts} (55%) 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/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); }); From c6062c5ef58340672c5de0140949a36f6b1e8c70 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Sat, 27 Nov 2021 16:42:52 +0000 Subject: [PATCH 30/54] Finish merging --- .../modifiers/surroundingPair/findSurroundingPairTextBased.ts | 2 +- src/scripts/transformRecordedTests.ts | 4 ++-- src/util/canonicalizeAndValidateCommand.ts | 2 +- src/util/canonicalizeTargets.ts | 2 +- src/util/doTargetsUsePrePhraseSnapshot.ts | 2 +- .../{getPartialPrimitiveTargets.ts => getPrimitiveTargets.ts} | 2 ++ 6 files changed, 8 insertions(+), 6 deletions(-) rename src/util/{getPartialPrimitiveTargets.ts => getPrimitiveTargets.ts} (98%) diff --git a/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts b/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts index 7b0f5458b0..e75741a2c0 100644 --- a/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts +++ b/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts @@ -226,7 +226,7 @@ interface Context { * start of the full range that we are willing to consider * @param isAtEndOfFullRange Indicates whether the current range is at the * end of the full range that we are willing to consider - * @returns The offsets of the matching surrounding pair, or `null` if none is + * @returns The offsets of the matching surrounding pair, or transformPartialPrimitiveTargetsnulltransformPartialPrimitiveTargets if none is * found */ function getDelimiterPairOffsets( diff --git a/src/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts index 7065d4d863..3dee2ed459 100644 --- a/src/scripts/transformRecordedTests.ts +++ b/src/scripts/transformRecordedTests.ts @@ -8,7 +8,7 @@ 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 { transformPartialPrimitiveTargets } from "../util/getPrimitiveTargets"; import { DelimiterInclusion, PartialPrimitiveTarget } from "../typings/Types"; import { mkdir, rename, unlink } from "fs/promises"; @@ -86,7 +86,7 @@ function reorderFields(fixture: TestCaseFixture) { // Leaving an example here in case it's helpful function updateSurroundingPairTest(fixture: TestCaseFixture) { - fixture.command.partialTargets = transformPrimitiveTargets( + fixture.command.partialTargets = transformPartialPrimitiveTargets( fixture.command.partialTargets, (target: PartialPrimitiveTarget) => { if (target.modifier?.type === "surroundingPair") { diff --git a/src/util/canonicalizeAndValidateCommand.ts b/src/util/canonicalizeAndValidateCommand.ts index 6533058f67..be91fce685 100644 --- a/src/util/canonicalizeAndValidateCommand.ts +++ b/src/util/canonicalizeAndValidateCommand.ts @@ -1,7 +1,7 @@ import canonicalizeActionName from "./canonicalizeActionName"; import canonicalizeTargets from "./canonicalizeTargets"; import { ActionType, PartialTarget, SelectionType } from "../typings/Types"; -import { getPartialPrimitiveTargets } from "./getPartialPrimitiveTargets"; +import { getPartialPrimitiveTargets } from "./getPrimitiveTargets"; export function canonicalizeAndValidateCommand( inputActionName: string, diff --git a/src/util/canonicalizeTargets.ts b/src/util/canonicalizeTargets.ts index 8e224f40a1..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 { transformPartialPrimitiveTargets } from "./getPartialPrimitiveTargets"; +import { transformPartialPrimitiveTargets } from "./getPrimitiveTargets"; import { HatStyleName } from "../core/constants"; import { flow } from "lodash"; diff --git a/src/util/doTargetsUsePrePhraseSnapshot.ts b/src/util/doTargetsUsePrePhraseSnapshot.ts index bb7b8cd1a2..00ba90e353 100644 --- a/src/util/doTargetsUsePrePhraseSnapshot.ts +++ b/src/util/doTargetsUsePrePhraseSnapshot.ts @@ -1,6 +1,6 @@ import { DecoratedSymbol, PartialTarget } from "../typings/Types"; import { uniq } from "lodash"; -import { getPartialPrimitiveTargets } from "./targetUtils"; +import { getPartialPrimitiveTargets } from "./getPrimitiveTargets"; export function doTargetsUsePrePhraseSnapshot( targets: PartialTarget[] diff --git a/src/util/getPartialPrimitiveTargets.ts b/src/util/getPrimitiveTargets.ts similarity index 98% rename from src/util/getPartialPrimitiveTargets.ts rename to src/util/getPrimitiveTargets.ts index 456445d3d7..8206390edf 100644 --- a/src/util/getPartialPrimitiveTargets.ts +++ b/src/util/getPrimitiveTargets.ts @@ -2,6 +2,8 @@ import { PartialPrimitiveTarget, PartialRangeTarget, PartialTarget, + PrimitiveTarget, + Target, } from "../typings/Types"; /** From 6c85e3730c403a4cd736cdac1cecce920529a0ce Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 29 Nov 2021 15:09:05 +0000 Subject: [PATCH 31/54] Some cleanup --- src/extension.ts | 127 +++--------------------------- src/registerCursorlessCommand.ts | 131 +++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 118 deletions(-) create mode 100644 src/registerCursorlessCommand.ts diff --git a/src/extension.ts b/src/extension.ts index 21a60a2426..4ded27ab21 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,16 +1,13 @@ import * as vscode from "vscode"; 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 { ThatMark } from "./core/ThatMark"; import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; -import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; -import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; import isTesting from "./testUtil/isTesting"; +import { registerCursorlessCommand } from "./registerCursorlessCommand"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); @@ -45,119 +42,13 @@ 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 - ); - - const usePrePhraseSnapshot = - doTargetsUsePrePhraseSnapshot(partialTargets); - const readableHatMap = await graph.hatTokenMap.getReadableMap( - usePrePhraseSnapshot - ); - - 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, - hatTokenMap: readableHatMap, - 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, - hatTokenMap: readableHatMap, - 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(hatTokenMap!, 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 cursorlessCommandDisposable = registerCursorlessCommand( + graph, + thatMark, + sourceMark, + getNodeAtLocation, + testCaseRecorder ); // Disabled for now. diff --git a/src/registerCursorlessCommand.ts b/src/registerCursorlessCommand.ts new file mode 100644 index 0000000000..f545a6a9d6 --- /dev/null +++ b/src/registerCursorlessCommand.ts @@ -0,0 +1,131 @@ +import * as vscode from "vscode"; +import inferFullTargets from "./core/inferFullTargets"; +import processTargets from "./processTargets"; +import { Graph, PartialTarget, ProcessedTargetsContext } from "./typings/Types"; +import { ThatMark } from "./core/ThatMark"; +import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; +import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; +import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; +import { SyntaxNode } from "web-tree-sitter"; + +// TODO: Do this using the graph once we migrate its dependencies onto the graph +export function registerCursorlessCommand( + graph: Graph, + thatMark: ThatMark, + sourceMark: ThatMark, + getNodeAtLocation: SyntaxNode, + testCaseRecorder: TestCaseRecorder +) { + return vscode.commands.registerCommand( + "cursorless.command", + async ( + spokenForm: string, + inputActionName: string, + inputPartialTargets: PartialTarget[], + ...inputExtraArgs: unknown[] + ) => { + try { + const { actionName, partialTargets, extraArgs } = + canonicalizeAndValidateCommand( + inputActionName, + inputPartialTargets, + inputExtraArgs + ); + + const usePrePhraseSnapshot = + doTargetsUsePrePhraseSnapshot(partialTargets); + const readableHatMap = await graph.hatTokenMap.getReadableMap( + usePrePhraseSnapshot + ); + + 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, + hatTokenMap: readableHatMap, + 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, + hatTokenMap: readableHatMap, + 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(hatTokenMap!, 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; + } + } + ); +} From 95ac8f9411151c491cc5ff1b1fc011f38b64f79c Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 29 Nov 2021 18:41:52 +0000 Subject: [PATCH 32/54] Create command runner class --- src/CommandRunner.ts | 144 +++++++++++++++++++++++++++++++ src/extension.ts | 5 +- src/registerCursorlessCommand.ts | 131 ---------------------------- 3 files changed, 146 insertions(+), 134 deletions(-) create mode 100644 src/CommandRunner.ts delete mode 100644 src/registerCursorlessCommand.ts diff --git a/src/CommandRunner.ts b/src/CommandRunner.ts new file mode 100644 index 0000000000..bc33d3a7a9 --- /dev/null +++ b/src/CommandRunner.ts @@ -0,0 +1,144 @@ +import * as vscode from "vscode"; +import inferFullTargets from "./core/inferFullTargets"; +import processTargets from "./processTargets"; +import { Graph, PartialTarget, ProcessedTargetsContext } from "./typings/Types"; +import { ThatMark } from "./core/ThatMark"; +import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; +import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; +import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; +import { SyntaxNode } from "web-tree-sitter"; + +// 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.runCommand = this.runCommand.bind(this); + + this.disposables.push( + vscode.commands.registerCommand("cursorless.command", this.runCommand) + ); + } + + async runCommand( + spokenForm: string, + inputActionName: string, + inputPartialTargets: PartialTarget[], + ...inputExtraArgs: unknown[] + ) { + try { + const { actionName, partialTargets, extraArgs } = + canonicalizeAndValidateCommand( + inputActionName, + inputPartialTargets, + inputExtraArgs + ); + + const usePrePhraseSnapshot = + doTargetsUsePrePhraseSnapshot(partialTargets); + const readableHatMap = await this.graph.hatTokenMap.getReadableMap( + usePrePhraseSnapshot + ); + + 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 = 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 command = { actionName, partialTargets, extraArgs }; + const context = { + targets, + thatMark: this.thatMark, + sourceMark: this.sourceMark, + hatTokenMap: readableHatMap, + spokenForm, + }; + await this.testCaseRecorder.preCommandHook(command, 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; + + // 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(hatTokenMap!, targets); + } 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; + } + } + + dispose() { + this.disposables.forEach(({ dispose }) => dispose()); + } +} diff --git a/src/extension.ts b/src/extension.ts index 4ded27ab21..1db8a23e29 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -7,7 +7,7 @@ import { ThatMark } from "./core/ThatMark"; import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import isTesting from "./testUtil/isTesting"; -import { registerCursorlessCommand } from "./registerCursorlessCommand"; +import CommandRunner from "./CommandRunner"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); @@ -43,7 +43,7 @@ export async function activate(context: vscode.ExtensionContext) { ); // TODO: Do this using the graph once we migrate its dependencies onto the graph - const cursorlessCommandDisposable = registerCursorlessCommand( + const commandRunner = new CommandRunner( graph, thatMark, sourceMark, @@ -96,7 +96,6 @@ export async function activate(context: vscode.ExtensionContext) { } context.subscriptions.push( - cursorlessCommandDisposable, cursorlessRecordTestCaseDisposable, vscode.window.onDidChangeTextEditorSelection( logBranchTypes(getNodeAtLocation) diff --git a/src/registerCursorlessCommand.ts b/src/registerCursorlessCommand.ts deleted file mode 100644 index f545a6a9d6..0000000000 --- a/src/registerCursorlessCommand.ts +++ /dev/null @@ -1,131 +0,0 @@ -import * as vscode from "vscode"; -import inferFullTargets from "./core/inferFullTargets"; -import processTargets from "./processTargets"; -import { Graph, PartialTarget, ProcessedTargetsContext } from "./typings/Types"; -import { ThatMark } from "./core/ThatMark"; -import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; -import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; -import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; -import { SyntaxNode } from "web-tree-sitter"; - -// TODO: Do this using the graph once we migrate its dependencies onto the graph -export function registerCursorlessCommand( - graph: Graph, - thatMark: ThatMark, - sourceMark: ThatMark, - getNodeAtLocation: SyntaxNode, - testCaseRecorder: TestCaseRecorder -) { - return vscode.commands.registerCommand( - "cursorless.command", - async ( - spokenForm: string, - inputActionName: string, - inputPartialTargets: PartialTarget[], - ...inputExtraArgs: unknown[] - ) => { - try { - const { actionName, partialTargets, extraArgs } = - canonicalizeAndValidateCommand( - inputActionName, - inputPartialTargets, - inputExtraArgs - ); - - const usePrePhraseSnapshot = - doTargetsUsePrePhraseSnapshot(partialTargets); - const readableHatMap = await graph.hatTokenMap.getReadableMap( - usePrePhraseSnapshot - ); - - 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, - hatTokenMap: readableHatMap, - 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, - hatTokenMap: readableHatMap, - 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(hatTokenMap!, 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; - } - } - ); -} From ef8624e9fc340df9e8ffcd83538655ff0dd7951f Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 29 Nov 2021 19:39:20 +0000 Subject: [PATCH 33/54] Working backwards compatible command runner --- src/{ => core/commandRunner}/CommandRunner.ts | 73 ++++++++++++++----- src/core/commandRunner/types.ts | 9 +++ src/extension.ts | 2 +- .../getIndividualDelimiters.ts | 5 +- src/util/type.ts | 3 + 5 files changed, 70 insertions(+), 22 deletions(-) rename src/{ => core/commandRunner}/CommandRunner.ts (69%) create mode 100644 src/core/commandRunner/types.ts create mode 100644 src/util/type.ts diff --git a/src/CommandRunner.ts b/src/core/commandRunner/CommandRunner.ts similarity index 69% rename from src/CommandRunner.ts rename to src/core/commandRunner/CommandRunner.ts index bc33d3a7a9..293b9d4122 100644 --- a/src/CommandRunner.ts +++ b/src/core/commandRunner/CommandRunner.ts @@ -1,12 +1,18 @@ import * as vscode from "vscode"; -import inferFullTargets from "./core/inferFullTargets"; -import processTargets from "./processTargets"; -import { Graph, PartialTarget, ProcessedTargetsContext } from "./typings/Types"; -import { ThatMark } from "./core/ThatMark"; -import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; -import { canonicalizeAndValidateCommand } from "./util/canonicalizeAndValidateCommand"; -import { doTargetsUsePrePhraseSnapshot } from "./util/doTargetsUsePrePhraseSnapshot"; +import inferFullTargets from "../inferFullTargets"; +import processTargets from "../../processTargets"; +import { + Graph, + PartialTarget, + ProcessedTargetsContext, +} from "../../typings/Types"; +import { ThatMark } from "../ThatMark"; +import { TestCaseRecorder } from "../../testUtil/TestCaseRecorder"; +import { canonicalizeAndValidateCommand } from "../../util/canonicalizeAndValidateCommand"; +import { doTargetsUsePrePhraseSnapshot } from "../../util/doTargetsUsePrePhraseSnapshot"; 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 { @@ -21,19 +27,26 @@ export default class CommandRunner { ) { graph.extensionContext.subscriptions.push(this); - this.runCommand = this.runCommand.bind(this); + this.runCommandBackwardCompatible = + this.runCommandBackwardCompatible.bind(this); this.disposables.push( - vscode.commands.registerCommand("cursorless.command", this.runCommand) + vscode.commands.registerCommand( + "cursorless.command", + this.runCommandBackwardCompatible + ) ); } - async runCommand( - spokenForm: string, - inputActionName: string, - inputPartialTargets: PartialTarget[], - ...inputExtraArgs: unknown[] - ) { + async runCommand(commandArgument: CommandArgument) { + const { + spokenForm, + action: inputActionName, + targets: inputPartialTargets, + extraArgs: inputExtraArgs, + usePrePhraseSnapshot, + } = commandArgument; + try { const { actionName, partialTargets, extraArgs } = canonicalizeAndValidateCommand( @@ -42,8 +55,6 @@ export default class CommandRunner { inputExtraArgs ); - const usePrePhraseSnapshot = - doTargetsUsePrePhraseSnapshot(partialTargets); const readableHatMap = await this.graph.hatTokenMap.getReadableMap( usePrePhraseSnapshot ); @@ -138,6 +149,34 @@ export default class CommandRunner { } } + private runCommandBackwardCompatible( + spokenFormOrCommandArgument: string | CommandArgument, + ...rest: unknown[] + ) { + let commandArgument: CommandArgument; + + if (isString(spokenFormOrCommandArgument)) { + const spokenForm = spokenFormOrCommandArgument; + const [action, targets, ...extraArgs] = rest as [ + string, + PartialTarget[], + ...unknown[] + ]; + + commandArgument = { + 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..a99ec5acb7 --- /dev/null +++ b/src/core/commandRunner/types.ts @@ -0,0 +1,9 @@ +import { PartialTarget } from "../../typings/Types"; + +export interface CommandArgument { + spokenForm: string; + usePrePhraseSnapshot: boolean; + action: string; + targets: PartialTarget[]; + extraArgs: unknown[]; +} diff --git a/src/extension.ts b/src/extension.ts index 1db8a23e29..d2d493e871 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -7,7 +7,7 @@ import { ThatMark } from "./core/ThatMark"; import { TestCaseRecorder } from "./testUtil/TestCaseRecorder"; import { getCommandServerApi, getParseTreeApi } from "./util/getExtensionApi"; import isTesting from "./testUtil/isTesting"; -import CommandRunner from "./CommandRunner"; +import CommandRunner from "./core/commandRunner/CommandRunner"; export async function activate(context: vscode.ExtensionContext) { const { getNodeAtLocation } = await getParseTreeApi(); 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/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; +} From e2440fc9ff4d12accaded16a66ace283179f43e0 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 30 Nov 2021 13:25:43 +0000 Subject: [PATCH 34/54] More backward compatibility fixes --- src/core/commandRunner/CommandRunner.ts | 31 +++-------------------- src/core/commandRunner/types.ts | 1 + src/typings/Types.ts | 1 - src/util/doTargetsUsePrePhraseSnapshot.ts | 23 ----------------- 4 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 src/util/doTargetsUsePrePhraseSnapshot.ts diff --git a/src/core/commandRunner/CommandRunner.ts b/src/core/commandRunner/CommandRunner.ts index 293b9d4122..6ddfd86fa8 100644 --- a/src/core/commandRunner/CommandRunner.ts +++ b/src/core/commandRunner/CommandRunner.ts @@ -9,7 +9,6 @@ import { import { ThatMark } from "../ThatMark"; import { TestCaseRecorder } from "../../testUtil/TestCaseRecorder"; import { canonicalizeAndValidateCommand } from "../../util/canonicalizeAndValidateCommand"; -import { doTargetsUsePrePhraseSnapshot } from "../../util/doTargetsUsePrePhraseSnapshot"; import { SyntaxNode } from "web-tree-sitter"; import { CommandArgument } from "./types"; import { isString } from "../../util/type"; @@ -59,12 +58,8 @@ export default class CommandRunner { usePrePhraseSnapshot ); - 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)); + console.debug(`commandArgument:`); + console.debug(JSON.stringify(commandArgument, null, 3)); const action = this.graph.actions[actionName]; @@ -118,27 +113,6 @@ export default class CommandRunner { } 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(hatTokenMap!, targets); } catch (e) { this.testCaseRecorder.commandErrorHook(); const err = e as Error; @@ -164,6 +138,7 @@ export default class CommandRunner { ]; commandArgument = { + version: 0, spokenForm, action, targets, diff --git a/src/core/commandRunner/types.ts b/src/core/commandRunner/types.ts index a99ec5acb7..0c8f792d9c 100644 --- a/src/core/commandRunner/types.ts +++ b/src/core/commandRunner/types.ts @@ -1,6 +1,7 @@ import { PartialTarget } from "../../typings/Types"; export interface CommandArgument { + version: 0 | 1; spokenForm: string; usePrePhraseSnapshot: boolean; action: string; diff --git a/src/typings/Types.ts b/src/typings/Types.ts index ea012157d0..b1b82e0158 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -44,7 +44,6 @@ export interface DecoratedSymbol { type: "decoratedSymbol"; symbolColor: HatStyleName; character: string; - usePrePhraseSnapshot?: boolean; } export type LineNumberType = "absolute" | "relative" | "modulo100"; diff --git a/src/util/doTargetsUsePrePhraseSnapshot.ts b/src/util/doTargetsUsePrePhraseSnapshot.ts deleted file mode 100644 index 00ba90e353..0000000000 --- a/src/util/doTargetsUsePrePhraseSnapshot.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { DecoratedSymbol, PartialTarget } from "../typings/Types"; -import { uniq } from "lodash"; -import { getPartialPrimitiveTargets } from "./getPrimitiveTargets"; - -export function doTargetsUsePrePhraseSnapshot( - targets: PartialTarget[] -): boolean { - const snapshotIds = getPartialPrimitiveTargets(targets) - .filter((target) => target.mark?.type === "decoratedSymbol") - .map((target) => (target.mark as DecoratedSymbol).usePrePhraseSnapshot); - - if (snapshotIds.length === 0) { - return false; - } - - const uniqueSnapshotIds = uniq(snapshotIds); - - if (uniqueSnapshotIds.length !== 1) { - throw new Error("Must use the same snapshot id for all targets"); - } - - return uniqueSnapshotIds[0] ?? false; -} From e888bbf21850e7e4eb1dd97d8bd65db0588c8bc6 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 30 Nov 2021 14:04:23 +0000 Subject: [PATCH 35/54] Rejects stale snapshots --- src/core/Decorations.ts | 6 ++++++ src/core/HatTokenMap.ts | 35 +++++++++++++++++++++++++++++++++++ src/util/bigint.ts | 3 +++ 3 files changed, 44 insertions(+) create mode 100644 src/util/bigint.ts diff --git a/src/core/Decorations.ts b/src/core/Decorations.ts index fc890ce4ae..c2896042ee 100644 --- a/src/core/Decorations.ts +++ b/src/core/Decorations.ts @@ -63,6 +63,12 @@ export default class Decorations { this.constructDecorations(this.graph.fontMeasurements); } + /** + * 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); diff --git a/src/core/HatTokenMap.ts b/src/core/HatTokenMap.ts index 44ed544bc2..163a8cf281 100644 --- a/src/core/HatTokenMap.ts +++ b/src/core/HatTokenMap.ts @@ -2,13 +2,31 @@ 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; @@ -47,7 +65,10 @@ export default class HatTokenMap { } 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; } @@ -61,6 +82,9 @@ export default class HatTokenMap { * @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) { @@ -78,6 +102,16 @@ export default class HatTokenMap { 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; } @@ -115,5 +149,6 @@ export default class HatTokenMap { } this.prePhraseMapSnapshot = this.activeMap.clone(); + this.prePhraseMapsSnapshotTimestamp = hrtime.bigint(); } } diff --git a/src/util/bigint.ts b/src/util/bigint.ts new file mode 100644 index 0000000000..76db68511b --- /dev/null +++ b/src/util/bigint.ts @@ -0,0 +1,3 @@ +export function abs(x: bigint) { + return x < BigInt(0) ? -x : x; +} From a17d90d146c7f56ec3fe63740457a1743482f574 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Tue, 30 Nov 2021 14:05:09 +0000 Subject: [PATCH 36/54] Add link --- src/util/bigint.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/bigint.ts b/src/util/bigint.ts index 76db68511b..712b3742b4 100644 --- a/src/util/bigint.ts +++ b/src/util/bigint.ts @@ -1,3 +1,4 @@ +// From https://stackoverflow.com/a/64953280 export function abs(x: bigint) { return x < BigInt(0) ? -x : x; } From 65bc4b9923585a2f828e8594455c96b9ef4f0308 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Wed, 1 Dec 2021 11:14:50 +0000 Subject: [PATCH 37/54] A bunch of refactoring --- src/core/HatTokenMap.ts | 2 +- src/core/commandRunner/CommandRunner.ts | 8 ++-- src/core/commandRunner/types.ts | 49 ++++++++++++++++++++++--- src/scripts/transformRecordedTests.ts | 35 +++++++++++++++--- src/test/suite/recorded.test.ts | 10 +---- src/testUtil/TestCase.ts | 20 +++------- src/testUtil/TestCaseRecorder.ts | 2 +- src/typings/Types.ts | 2 +- src/util/makeGraph.ts | 2 + 9 files changed, 91 insertions(+), 39 deletions(-) diff --git a/src/core/HatTokenMap.ts b/src/core/HatTokenMap.ts index 163a8cf281..a314ae4546 100644 --- a/src/core/HatTokenMap.ts +++ b/src/core/HatTokenMap.ts @@ -127,7 +127,7 @@ export default class HatTokenMap { } private async maybeTakePrePhraseSnapshot() { - const phraseStartSignal = this.graph.commandServerApi?.signals.prePhrase; + const phraseStartSignal = this.graph.commandServerApi?.signals?.prePhrase; if (phraseStartSignal != null) { const newSignalVersion = await phraseStartSignal.getVersion(); diff --git a/src/core/commandRunner/CommandRunner.ts b/src/core/commandRunner/CommandRunner.ts index 6ddfd86fa8..3e74c10da3 100644 --- a/src/core/commandRunner/CommandRunner.ts +++ b/src/core/commandRunner/CommandRunner.ts @@ -2,6 +2,7 @@ import * as vscode from "vscode"; import inferFullTargets from "../inferFullTargets"; import processTargets from "../../processTargets"; import { + ActionType, Graph, PartialTarget, ProcessedTargetsContext, @@ -43,7 +44,7 @@ export default class CommandRunner { action: inputActionName, targets: inputPartialTargets, extraArgs: inputExtraArgs, - usePrePhraseSnapshot, + usePrePhraseSnapshot = false, } = commandArgument; try { @@ -88,7 +89,6 @@ export default class CommandRunner { const selections = processTargets(processedTargetsContext, targets); if (this.testCaseRecorder.active) { - const command = { actionName, partialTargets, extraArgs }; const context = { targets, thatMark: this.thatMark, @@ -96,7 +96,7 @@ export default class CommandRunner { hatTokenMap: readableHatMap, spokenForm, }; - await this.testCaseRecorder.preCommandHook(command, context); + await this.testCaseRecorder.preCommandHook(commandArgument, context); } const { @@ -132,7 +132,7 @@ export default class CommandRunner { if (isString(spokenFormOrCommandArgument)) { const spokenForm = spokenFormOrCommandArgument; const [action, targets, ...extraArgs] = rest as [ - string, + ActionType, PartialTarget[], ...unknown[] ]; diff --git a/src/core/commandRunner/types.ts b/src/core/commandRunner/types.ts index 0c8f792d9c..32dbb3489e 100644 --- a/src/core/commandRunner/types.ts +++ b/src/core/commandRunner/types.ts @@ -1,10 +1,49 @@ -import { PartialTarget } from "../../typings/Types"; +import { ActionType, PartialTarget } from "../../typings/Types"; -export interface CommandArgument { +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; - spokenForm: string; - usePrePhraseSnapshot: boolean; - action: string; + + /** + * 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/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts index 3dee2ed459..c18d80ba4e 100644 --- a/src/scripts/transformRecordedTests.ts +++ b/src/scripts/transformRecordedTests.ts @@ -18,7 +18,7 @@ import { mkdir, rename, unlink } from "fs/promises"; */ const FIXTURE_TRANSFORMATION: ( originalFixture: TestCaseFixture -) => TestCaseFixture = identity; +) => TestCaseFixture = upgradeVersion; async function main() { const directory = path.join( @@ -68,12 +68,11 @@ function identity(fixture: TestCaseFixture) { } function canonicalizeActionNames(fixture: TestCaseFixture) { - return update(fixture, { command: { actionName: canonicalizeActionName } }); + return update(fixture, { command: { action: canonicalizeActionName } }); } function reorderFields(fixture: TestCaseFixture) { return { - spokenForm: fixture.spokenForm, languageId: fixture.languageId, command: fixture.command, marksToCheck: fixture.marksToCheck, @@ -84,10 +83,36 @@ function reorderFields(fixture: TestCaseFixture) { }; } +function upgradeVersion(fixture: TestCaseFixture) { + const { command, spokenForm, ...rest } = fixture as any; + command.version = 1; + command.spokenForm = spokenForm; + // TODO: Change names of action targets etcetera + let usePrePhraseSnapshot: boolean = false; + command.targets = transformPartialPrimitiveTargets( + command.targets, + (target: PartialPrimitiveTarget) => { + if (target.mark?.type === "decoratedSymbol") { + usePrePhraseSnapshot = + usePrePhraseSnapshot || (target.mark as any).usePrePhraseSnapshot; + (target.mark as any).usePrePhraseSnapshot = undefined; + } + return target; + } + ); + + command.usePrePhraseSnapshot = usePrePhraseSnapshot; + + return { + command, + ...rest, + }; +} + // Leaving an example here in case it's helpful function updateSurroundingPairTest(fixture: TestCaseFixture) { - fixture.command.partialTargets = transformPartialPrimitiveTargets( - fixture.command.partialTargets, + fixture.command.targets = transformPartialPrimitiveTargets( + fixture.command.targets, (target: PartialPrimitiveTarget) => { if (target.modifier?.type === "surroundingPair") { let delimiterInclusion: DelimiterInclusion; diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index e9bdd22435..369879f4f8 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -22,7 +22,6 @@ import { enableDebugLog } from "../../util/debug"; import { extractTargetedMarks } from "../../testUtil/extractTargetedMarks"; import asyncSafety from "./asyncSafety"; import { ReadOnlyHatMap } from "../../core/IndividualHatMap"; -import { doTargetsUsePrePhraseSnapshot } from "../../util/doTargetsUsePrePhraseSnapshot"; import { mockPrePhraseGetVersion } from "../mockPrePhraseGetVersion"; import { openNewEditor } from "../openNewEditor"; @@ -106,9 +105,7 @@ async function runTest(file: string) { await graph.hatTokenMap.addDecorations(); - const usePrePhraseSnapshot = doTargetsUsePrePhraseSnapshot( - fixture.command.partialTargets - ); + const usePrePhraseSnapshot = fixture.command.usePrePhraseSnapshot ?? false; if (usePrePhraseSnapshot) { mockPrePhraseGetVersion(graph, async () => "version"); @@ -123,10 +120,7 @@ async function runTest(file: string) { const returnValue = await vscode.commands.executeCommand( "cursorless.command", - fixture.spokenForm, - fixture.command.actionName, - fixture.command.partialTargets, - ...fixture.command.extraArgs + fixture.command ); const marks = diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index 19b6d283d2..f0d59dc8af 100644 --- a/src/testUtil/TestCase.ts +++ b/src/testUtil/TestCase.ts @@ -11,15 +11,11 @@ import { takeSnapshot, TestCaseSnapshot } from "./takeSnapshot"; import serialize from "./serialize"; import { pick } from "lodash"; import { ReadOnlyHatMap } from "../core/IndividualHatMap"; +import { CommandArgument } from "../core/commandRunner/types"; -export type TestCaseCommand = { - actionName: ActionType; - partialTargets: PartialTarget[]; - extraArgs: any[]; -}; +export type TestCaseCommand = CommandArgument; export type TestCaseContext = { - spokenForm: string; thatMark: ThatMark; sourceMark: ThatMark; targets: Target[]; @@ -27,7 +23,6 @@ export type TestCaseContext = { }; export type TestCaseFixture = { - spokenForm: string; command: TestCaseCommand; languageId: string; @@ -44,7 +39,6 @@ export type TestCaseFixture = { }; export class TestCase { - spokenForm: string; languageId: string; fullTargets: Target[]; initialState: TestCaseSnapshot | null = null; @@ -55,17 +49,16 @@ export class TestCase { marksToCheck?: string[]; constructor( - private command: TestCaseCommand, + public command: TestCaseCommand, private context: TestCaseContext, private isHatTokenMapTest: boolean = false ) { const activeEditor = vscode.window.activeTextEditor!; - 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 = isHatTokenMapTest; @@ -105,7 +98,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) => @@ -122,7 +115,7 @@ export class TestCase { "scrollToBottom", "scrollToCenter", "scrollToTop", - ].includes(this.command.actionName), + ].includes(this.command.action), }; return Object.keys(excludableFields).filter( @@ -135,7 +128,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, diff --git a/src/testUtil/TestCaseRecorder.ts b/src/testUtil/TestCaseRecorder.ts index 07abdea8f1..596df602ad 100644 --- a/src/testUtil/TestCaseRecorder.ts +++ b/src/testUtil/TestCaseRecorder.ts @@ -157,7 +157,7 @@ export class TestCaseRecorder { fs.mkdirSync(targetDirectory); } - 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/typings/Types.ts b/src/typings/Types.ts index b1b82e0158..deea857001 100644 --- a/src/typings/Types.ts +++ b/src/typings/Types.ts @@ -369,7 +369,7 @@ export interface Graph { readonly editStyles: EditStyles; /** - * Keeps a map of all decorated marks + * Maps from (hatStyle, character) pairs to tokens */ readonly hatTokenMap: HatTokenMap; diff --git a/src/util/makeGraph.ts b/src/util/makeGraph.ts index 12240938e6..fc0a878304 100644 --- a/src/util/makeGraph.ts +++ b/src/util/makeGraph.ts @@ -39,6 +39,8 @@ export default function makeGraph( factoryMap, key as keyof GraphType ), + + // NB: If we're testing, we make property mutable to allow mocking configurable: isTesting(), }); }); From 12694fbca9a53ac81369abaf9156619c267df0c3 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 2 Dec 2021 19:08:12 +0000 Subject: [PATCH 38/54] Test fixes --- src/core/Decorations.ts | 7 ++-- src/core/commandRunner/CommandRunner.ts | 2 +- src/core/commandRunner/types.ts | 2 +- src/scripts/transformRecordedTests.ts | 40 ++++++++++++-------- src/test/suite/backwardCompatibility.test.ts | 37 ++++++++++++++++++ src/test/suite/prePhraseSnapshot.test.ts | 30 +++++++-------- src/testUtil/TestCase.ts | 2 +- 7 files changed, 83 insertions(+), 37 deletions(-) create mode 100644 src/test/suite/backwardCompatibility.test.ts diff --git a/src/core/Decorations.ts b/src/core/Decorations.ts index c2896042ee..0513008e12 100644 --- a/src/core/Decorations.ts +++ b/src/core/Decorations.ts @@ -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; @@ -190,9 +191,9 @@ export default class Decorations { shapePenalties.default = 0; colorPenalties.default = 0; - const activeHatColors = HAT_COLORS.filter( - (color) => colorEnablement[color] - ); + const activeHatColors = isTesting() + ? HAT_COLORS + : HAT_COLORS.filter((color) => colorEnablement[color]); const activeNonDefaultHatShapes = HAT_NON_DEFAULT_SHAPES.filter( (shape) => shapeEnablement[shape] ); diff --git a/src/core/commandRunner/CommandRunner.ts b/src/core/commandRunner/CommandRunner.ts index 3e74c10da3..1063cb79ad 100644 --- a/src/core/commandRunner/CommandRunner.ts +++ b/src/core/commandRunner/CommandRunner.ts @@ -52,7 +52,7 @@ export default class CommandRunner { canonicalizeAndValidateCommand( inputActionName, inputPartialTargets, - inputExtraArgs + inputExtraArgs ?? [] ); const readableHatMap = await this.graph.hatTokenMap.getReadableMap( diff --git a/src/core/commandRunner/types.ts b/src/core/commandRunner/types.ts index 32dbb3489e..169e32be11 100644 --- a/src/core/commandRunner/types.ts +++ b/src/core/commandRunner/types.ts @@ -45,5 +45,5 @@ interface CommandArgumentV0V1 { /** * A list of extra arguments expected by the given action. */ - extraArgs: unknown[]; + extraArgs?: unknown[]; } diff --git a/src/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts index c18d80ba4e..66f41c183b 100644 --- a/src/scripts/transformRecordedTests.ts +++ b/src/scripts/transformRecordedTests.ts @@ -1,4 +1,3 @@ -import * as fs from "fs"; import update from "immutability-helper"; import { promises as fsp } from "fs"; import * as path from "path"; @@ -10,7 +9,7 @@ import serialize from "../testUtil/serialize"; import canonicalizeActionName from "../util/canonicalizeActionName"; import { transformPartialPrimitiveTargets } from "../util/getPrimitiveTargets"; import { DelimiterInclusion, PartialPrimitiveTarget } from "../typings/Types"; -import { mkdir, rename, unlink } from "fs/promises"; +import { mkdir, rename } from "fs/promises"; /** * The transformation to run on all recorded test fixtures. Change this @@ -18,7 +17,7 @@ import { mkdir, rename, unlink } from "fs/promises"; */ const FIXTURE_TRANSFORMATION: ( originalFixture: TestCaseFixture -) => TestCaseFixture = upgradeVersion; +) => TestCaseFixture = identity; async function main() { const directory = path.join( @@ -85,28 +84,37 @@ function reorderFields(fixture: TestCaseFixture) { function upgradeVersion(fixture: TestCaseFixture) { const { command, spokenForm, ...rest } = fixture as any; - command.version = 1; - command.spokenForm = spokenForm; - // TODO: Change names of action targets etcetera - let usePrePhraseSnapshot: boolean = false; - command.targets = transformPartialPrimitiveTargets( - command.targets, + const { + actionName: action, + partialTargets: originalTargets, + extraArgs, + } = command; + let usePrePhraseSnapshot: boolean | undefined = undefined; + const targets = transformPartialPrimitiveTargets( + originalTargets, (target: PartialPrimitiveTarget) => { if (target.mark?.type === "decoratedSymbol") { - usePrePhraseSnapshot = - usePrePhraseSnapshot || (target.mark as any).usePrePhraseSnapshot; + if ((target.mark as any).usePrePhraseSnapshot) { + usePrePhraseSnapshot = true; + } + (target.mark as any).usePrePhraseSnapshot = undefined; } return target; } ); - command.usePrePhraseSnapshot = usePrePhraseSnapshot; - - return { - command, + return reorderFields({ + command: { + version: 1, + spokenForm, + action, + targets, + extraArgs, + usePrePhraseSnapshot, + }, ...rest, - }; + }); } // Leaving an example here in case it's helpful 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/prePhraseSnapshot.test.ts b/src/test/suite/prePhraseSnapshot.test.ts index 108d1fc266..2640303eb5 100644 --- a/src/test/suite/prePhraseSnapshot.test.ts +++ b/src/test/suite/prePhraseSnapshot.test.ts @@ -52,19 +52,19 @@ async function runTest( mockPrePhraseGetVersion(graph, async () => prePhraseVersion); - await vscode.commands.executeCommand( - "cursorless.command", - "whatever", - "replaceWithTarget", - [ + 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(); @@ -73,22 +73,22 @@ async function runTest( prePhraseVersion = "version2"; } - await vscode.commands.executeCommand( - "cursorless.command", - "whatever", - "setSelection", - [ + await vscode.commands.executeCommand("cursorless.command", { + version: 1, + spokenForm: "whatever", + action: "setSelection", + targets: [ { type: "primitive", mark: { type: "decoratedSymbol", symbolColor: "default", character: "o", - usePrePhraseSnapshot, }, }, - ] - ); + ], + usePrePhraseSnapshot, + }); assert.deepStrictEqual( editor.selections.map(selectionToPlainObject), diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index f0d59dc8af..e053ad91da 100644 --- a/src/testUtil/TestCase.ts +++ b/src/testUtil/TestCase.ts @@ -23,8 +23,8 @@ export type TestCaseContext = { }; export type TestCaseFixture = { - command: TestCaseCommand; languageId: string; + command: TestCaseCommand; /** * A list of marks to check in the case of navigation map test otherwise undefined From e5de4dad759ca9da059d9a00ef62aaf78fc9552b Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 2 Dec 2021 19:14:07 +0000 Subject: [PATCH 39/54] Revert change --- .../modifiers/surroundingPair/findSurroundingPairTextBased.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts b/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts index e75741a2c0..7b0f5458b0 100644 --- a/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts +++ b/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts @@ -226,7 +226,7 @@ interface Context { * start of the full range that we are willing to consider * @param isAtEndOfFullRange Indicates whether the current range is at the * end of the full range that we are willing to consider - * @returns The offsets of the matching surrounding pair, or transformPartialPrimitiveTargetsnulltransformPartialPrimitiveTargets if none is + * @returns The offsets of the matching surrounding pair, or `null` if none is * found */ function getDelimiterPairOffsets( From 7358f3b01bc7780bdbad2ae6ae210688e6b48c70 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 2 Dec 2021 19:27:51 +0000 Subject: [PATCH 40/54] Improved canonicalization --- src/core/commandRunner/CommandRunner.ts | 27 ++++++--------- src/scripts/transformRecordedTests.ts | 40 ++-------------------- src/util/canonicalizeAndValidateCommand.ts | 25 ++++++++++---- 3 files changed, 31 insertions(+), 61 deletions(-) diff --git a/src/core/commandRunner/CommandRunner.ts b/src/core/commandRunner/CommandRunner.ts index 1063cb79ad..3e44ae22f2 100644 --- a/src/core/commandRunner/CommandRunner.ts +++ b/src/core/commandRunner/CommandRunner.ts @@ -39,29 +39,22 @@ export default class CommandRunner { } async runCommand(commandArgument: CommandArgument) { - const { - spokenForm, - action: inputActionName, - targets: inputPartialTargets, - extraArgs: inputExtraArgs, - usePrePhraseSnapshot = false, - } = commandArgument; - try { - const { actionName, partialTargets, extraArgs } = - canonicalizeAndValidateCommand( - inputActionName, - inputPartialTargets, - inputExtraArgs ?? [] - ); + console.debug(`commandArgument:`); + console.debug(JSON.stringify(commandArgument, null, 3)); + + const { + spokenForm, + action: actionName, + targets: partialTargets, + extraArgs, + usePrePhraseSnapshot = false, + } = canonicalizeAndValidateCommand(commandArgument); const readableHatMap = await this.graph.hatTokenMap.getReadableMap( usePrePhraseSnapshot ); - console.debug(`commandArgument:`); - console.debug(JSON.stringify(commandArgument, null, 3)); - const action = this.graph.actions[actionName]; if (action == null) { diff --git a/src/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts index 66f41c183b..2e2eb4d89a 100644 --- a/src/scripts/transformRecordedTests.ts +++ b/src/scripts/transformRecordedTests.ts @@ -10,6 +10,7 @@ import canonicalizeActionName from "../util/canonicalizeActionName"; import { transformPartialPrimitiveTargets } from "../util/getPrimitiveTargets"; import { DelimiterInclusion, PartialPrimitiveTarget } from "../typings/Types"; import { mkdir, rename } from "fs/promises"; +import { canonicalizeAndValidateCommand } from "../util/canonicalizeAndValidateCommand"; /** * The transformation to run on all recorded test fixtures. Change this @@ -66,8 +67,8 @@ function identity(fixture: TestCaseFixture) { return fixture; } -function canonicalizeActionNames(fixture: TestCaseFixture) { - return update(fixture, { command: { action: canonicalizeActionName } }); +function canonicalizeCommand(fixture: TestCaseFixture) { + return update(fixture, { command: canonicalizeAndValidateCommand }); } function reorderFields(fixture: TestCaseFixture) { @@ -82,41 +83,6 @@ function reorderFields(fixture: TestCaseFixture) { }; } -function upgradeVersion(fixture: TestCaseFixture) { - const { command, spokenForm, ...rest } = fixture as any; - const { - actionName: action, - partialTargets: originalTargets, - extraArgs, - } = command; - let usePrePhraseSnapshot: boolean | undefined = undefined; - const targets = transformPartialPrimitiveTargets( - originalTargets, - (target: PartialPrimitiveTarget) => { - if (target.mark?.type === "decoratedSymbol") { - if ((target.mark as any).usePrePhraseSnapshot) { - usePrePhraseSnapshot = true; - } - - (target.mark as any).usePrePhraseSnapshot = undefined; - } - return target; - } - ); - - return reorderFields({ - command: { - version: 1, - spokenForm, - action, - targets, - extraArgs, - usePrePhraseSnapshot, - }, - ...rest, - }); -} - // Leaving an example here in case it's helpful function updateSurroundingPairTest(fixture: TestCaseFixture) { fixture.command.targets = transformPartialPrimitiveTargets( diff --git a/src/util/canonicalizeAndValidateCommand.ts b/src/util/canonicalizeAndValidateCommand.ts index be91fce685..06218d5761 100644 --- a/src/util/canonicalizeAndValidateCommand.ts +++ b/src/util/canonicalizeAndValidateCommand.ts @@ -2,12 +2,21 @@ import canonicalizeActionName from "./canonicalizeActionName"; import canonicalizeTargets from "./canonicalizeTargets"; import { ActionType, PartialTarget, SelectionType } from "../typings/Types"; import { getPartialPrimitiveTargets } from "./getPrimitiveTargets"; +import { + CommandArgument, + CommandArgumentLatest, +} from "../core/commandRunner/types"; export function canonicalizeAndValidateCommand( - inputActionName: string, - inputPartialTargets: PartialTarget[], - inputExtraArgs: any[] -) { + commandArgument: CommandArgument +): CommandArgumentLatest { + const { + action: inputActionName, + targets: inputPartialTargets, + extraArgs: inputExtraArgs = [], + ...rest + } = commandArgument; + const actionName = canonicalizeActionName(inputActionName); const partialTargets = canonicalizeTargets(inputPartialTargets); const extraArgs = inputExtraArgs; @@ -15,9 +24,11 @@ export function canonicalizeAndValidateCommand( validateCommand(actionName, partialTargets, extraArgs); return { - actionName, - partialTargets, - extraArgs, + ...rest, + version: 1, + action: actionName, + targets: partialTargets, + extraArgs: extraArgs, }; } From 0f9cfd6c64b3837442255855674772f05bd49e4d Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 2 Dec 2021 19:31:19 +0000 Subject: [PATCH 41/54] Add comment --- .../recorded/actions/bringAirAndBatAndCap.yml | 7 ++++--- .../actions/bringAirAndBatAndCapToAfterDrum.yml | 7 ++++--- .../actions/bringAirAndBatAndCapToAfterItemEach.yml | 7 ++++--- .../actions/bringAirAndBatAndCapToBeforeDrum.yml | 7 ++++--- .../actions/bringAirAndBatAndCapToBeforeItemEach.yml | 7 ++++--- .../actions/bringLineAirAndBatAndCapToAfterDrum.yml | 7 ++++--- .../actions/bringLineAirAndBatAndCapToBeforeDrum.yml | 7 ++++--- .../suite/fixtures/recorded/actions/bringVest.yml | 7 ++++--- .../fixtures/recorded/actions/bringVestToCap.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/callFine.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/callVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/callVestOnCap.yml | 7 ++++--- .../suite/fixtures/recorded/actions/carveVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/chuckVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/clearVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/commentVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/copyVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/dedentVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/drinkVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/dropVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/dupeUpVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/dupeVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/findVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/floatVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/giveAfterDot.yml | 7 ++++--- .../fixtures/recorded/actions/giveAirAndBang.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/giveBat.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/giveBat2.yml | 7 ++++--- .../suite/fixtures/recorded/actions/giveBeforeDot.yml | 7 ++++--- .../suite/fixtures/recorded/actions/giveBlueQuote.yml | 7 ++++--- .../recorded/actions/giveBlueQuoteAndQuote.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/giveCap.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/giveDot.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/giveDot2.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/giveDrum.yml | 7 ++++--- .../fixtures/recorded/actions/giveEqualsPastColon.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/giveHarp.yml | 7 ++++--- .../fixtures/recorded/actions/giveHarpAndWhale.yml | 7 ++++--- .../suite/fixtures/recorded/actions/giveQuote.yml | 7 ++++--- .../fixtures/recorded/actions/giveQuoteAndAir.yml | 7 ++++--- .../fixtures/recorded/actions/giveQuoteAndBang.yml | 7 ++++--- .../fixtures/recorded/actions/giveVestAndHarp.yml | 7 ++++--- .../suite/fixtures/recorded/actions/indentVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/moveVest.yml | 7 ++++--- .../suite/fixtures/recorded/actions/moveVestToCap.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/pasteCap.yml | 7 ++++--- .../suite/fixtures/recorded/actions/phonesSpy.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/postVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/pourVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/preeVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/puffVest.yml | 7 ++++--- .../fixtures/recorded/actions/reformatHarpAsSnake.yml | 7 ++++--- .../recorded/actions/reformatHarpAsSnake2.yml | 7 ++++--- .../actions/replaceAirAndBatAndCapWithCount.yml | 7 ++++--- .../recorded/actions/replaceVestWithWhatever.yml | 7 ++++--- .../recorded/actions/reverseAirAndBatAndCap.yml | 7 ++++--- .../suite/fixtures/recorded/actions/roundWrapThis.yml | 7 ++++--- .../suite/fixtures/recorded/actions/roundWrapVest.yml | 7 ++++--- .../fixtures/recorded/actions/roundWrapVest2.yml | 7 ++++--- .../fixtures/recorded/actions/sortAirAndCapAndBat.yml | 7 ++++--- .../fixtures/recorded/actions/swapVestWithCap.yml | 7 ++++--- .../suite/fixtures/recorded/actions/swapWithVest.yml | 7 ++++--- src/test/suite/fixtures/recorded/actions/takeVest.yml | 7 ++++--- .../compoundTargets/takeCapAndVestAndHarp.yml | 7 ++++--- .../recorded/compoundTargets/takeCapPastHarp.yml | 7 ++++--- .../compoundTargets/takeHarpAndVestAndCap.yml | 7 ++++--- .../recorded/compoundTargets/takeHarpPastCap.yml | 7 ++++--- .../recorded/compoundTargets/takeLineVestAndAir.yml | 7 ++++--- .../recorded/compoundTargets/takePastEndOfToken.yml | 7 ++++--- .../recorded/compoundTargets/takePastStartOfToken.yml | 7 ++++--- .../recorded/compoundTargets/takePastTrap.yml | 7 ++++--- .../recorded/compoundTargets/takeTokenPastTrap.yml | 7 ++++--- .../recorded/compoundTargets/takeVestTweenWhale.yml | 7 ++++--- .../recorded/compoundTargets/takeVestUntilWhale.yml | 7 ++++--- .../recorded/compoundTargets/takeWhaleTweenVest.yml | 7 ++++--- .../recorded/compoundTargets/takeWhaleUntilVest.yml | 7 ++++--- .../hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml | 7 ++++--- .../hatTokenMap/bringCommaToEndOfPointTakePoint.yml | 7 ++++--- .../hatTokenMap/bringCommaToStartOfPointTakePoint.yml | 7 ++++--- .../hatTokenMap/bringHarpAfterWhaleTakeWhale.yml | 7 ++++--- ...gHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml | 7 ++++--- ...ringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml | 7 ++++--- .../hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml | 7 ++++--- .../recorded/hatTokenMap/bringHarpTakeWhale.yml | 7 ++++--- .../hatTokenMap/bringHarpToEndOfPointTakePoint.yml | 7 ++++--- .../hatTokenMap/bringHarpToStartOfPointTakePoint.yml | 7 ++++--- .../hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml | 7 ++++--- .../bringPointAfterFirstCarWhaleTakeWhale.yml | 7 ++++--- ...arpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml | 7 ++++--- .../bringPointAndHarpToEndOfThisAndEndOfWhale.yml | 7 ++++--- ...gPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml | 7 ++++--- ...oStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml | 11 ++++++----- ...ringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml | 7 ++++--- ...intToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml | 7 ++++--- ...oStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml | 11 ++++++----- .../hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml | 7 ++++--- .../hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml | 7 ++++--- .../bringPointToThirdCarWhaleTakeWhale.yml | 7 ++++--- .../hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml | 7 ++++--- .../chuckFourthCarWhalePastThirdCarAirTakeWhale.yml | 7 ++++--- .../hatTokenMap/chuckHarpPastAirTakeWhale.yml | 7 ++++--- .../hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml | 7 ++++--- .../chuckSecondPastThirdCarWhaleTakeWhale.yml | 7 ++++--- .../chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml | 7 ++++--- ...CarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml | 7 ++++--- .../suite/fixtures/recorded/hatTokenMap/takeHarp.yml | 10 ++++++---- .../suite/fixtures/recorded/headTail/takeHead.yml | 7 ++++--- .../suite/fixtures/recorded/headTail/takeHeadVest.yml | 7 ++++--- .../suite/fixtures/recorded/headTail/takeTail.yml | 7 ++++--- .../suite/fixtures/recorded/headTail/takeTailVest.yml | 7 ++++--- .../inference/bringLineBatPastEndOfFunkToThis.yml | 7 ++++--- .../recorded/inference/bringMapAirToLineHarp.yml | 7 ++++--- .../recorded/inference/bringMapAirToTokenHarp.yml | 7 ++++--- .../fixtures/recorded/inference/bringOddToLine.yml | 7 ++++--- .../fixtures/recorded/inference/bringOddToState.yml | 7 ++++--- .../fixtures/recorded/inference/bringOddToToken.yml | 7 ++++--- .../recorded/inference/bringTokenHarpToMapAir.yml | 7 ++++--- .../fixtures/recorded/inference/ifWrapTokenFine.yml | 7 ++++--- .../recorded/inference/takeAfterVestPastAir.yml | 7 ++++--- .../recorded/inference/takeAfterVestPastBeforeAir.yml | 7 ++++--- .../recorded/inference/takeAirPastEndOfLine.yml | 7 ++++--- .../recorded/inference/takeEachPastStartOfLine.yml | 7 ++++--- .../fixtures/recorded/inference/takeFirstWord.yml | 7 ++++--- .../recorded/inference/takeHarpAndStringEach.yml | 7 ++++--- .../recorded/inference/takeHarpPastStringEach.yml | 7 ++++--- .../fixtures/recorded/inference/takeLastChar.yml | 7 ++++--- .../fixtures/recorded/inference/takeLinePastAir.yml | 7 ++++--- .../recorded/inference/takeLineVestAndAir.yml | 7 ++++--- .../recorded/inference/takeLineVestPastAir.yml | 7 ++++--- .../recorded/inference/takeOddPastEndOfState.yml | 7 ++++--- .../fixtures/recorded/inference/takeOddPastLine.yml | 7 ++++--- .../fixtures/recorded/inference/takeOddPastState.yml | 7 ++++--- .../fixtures/recorded/inference/takeOddPastToken.yml | 7 ++++--- .../fixtures/recorded/inference/takePastLineAir.yml | 7 ++++--- .../recorded/inference/takeStringHarpAndEach.yml | 7 ++++--- .../recorded/inference/takeStringHarpPastEach.yml | 7 ++++--- .../recorded/inference/takeVestAndLineAir.yml | 7 ++++--- .../recorded/inference/takeVestPastAfterAir.yml | 7 ++++--- .../recorded/inference/takeVestPastBeforeAir.yml | 7 ++++--- .../recorded/inference/takeVestPastLineAir.yml | 7 ++++--- .../suite/fixtures/recorded/languages/c/clearFunk.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/chuckTypeAir.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/chuckTypeSoon.yml | 7 ++++--- .../recorded/languages/cpp/elseStateWrapThis.yml | 7 ++++--- .../recorded/languages/cpp/ifElseWrapThis.yml | 7 ++++--- .../recorded/languages/cpp/ifStateWrapThis.yml | 7 ++++--- .../suite/fixtures/recorded/languages/cpp/takeArg.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeArg2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeAttribute.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeCall.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeClass.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeClass2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeClassName.yml | 7 ++++--- .../recorded/languages/cpp/takeClassName2.yml | 7 ++++--- .../recorded/languages/cpp/takeClassName3.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeComment.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeEveryArg.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeEveryItem.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeFunk.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeFunk2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeFunkName.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeFunkName2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeFunkName3.yml | 7 ++++--- .../suite/fixtures/recorded/languages/cpp/takeIf.yml | 7 ++++--- .../suite/fixtures/recorded/languages/cpp/takeIf2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeItem.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeItem2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeLambda.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeList.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeList2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeName.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeName2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeName3.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeState.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeState2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeState3.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeString.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeType.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeType2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeType3.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeValue.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeValue2.yml | 7 ++++--- .../fixtures/recorded/languages/cpp/takeValue3.yml | 7 ++++--- .../recorded/languages/cpp/tryCatchWrapThis.yml | 7 ++++--- .../recorded/languages/cpp/tryCatchWrapThis2.yml | 7 ++++--- .../recorded/languages/csharp/chuckTypeSoon.yml | 7 ++++--- .../recorded/languages/csharp/chuckTypeSoon2.yml | 7 ++++--- .../recorded/languages/csharp/elseStateWrapThis.yml | 7 ++++--- .../recorded/languages/csharp/ifElseWrapThis.yml | 7 ++++--- .../recorded/languages/csharp/ifStateWrapThis.yml | 7 ++++--- .../recorded/languages/csharp/tryCatchWrapThis.yml | 7 ++++--- .../recorded/languages/csharp/tryCatchWrapThis2.yml | 7 ++++--- .../recorded/languages/java/chuckTypeNear.yml | 7 ++++--- .../recorded/languages/java/chuckTypeUrge.yml | 7 ++++--- .../recorded/languages/java/elseStateWrapThis.yml | 7 ++++--- .../recorded/languages/java/ifElseWrapThis.yml | 7 ++++--- .../recorded/languages/java/ifStateWrapThis.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeArg.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeArg2.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeCall.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeClass.yml | 7 ++++--- .../recorded/languages/java/takeClassName.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeComment.yml | 7 ++++--- .../recorded/languages/java/takeCondition.yml | 7 ++++--- .../recorded/languages/java/takeCondition2.yml | 7 ++++--- .../recorded/languages/java/takeCondition3.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeEveryArg.yml | 7 ++++--- .../recorded/languages/java/takeEveryArg2.yml | 7 ++++--- .../recorded/languages/java/takeEveryItem.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeFunk.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeFunk2.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeFunkName.yml | 7 ++++--- .../recorded/languages/java/takeFunkName2.yml | 7 ++++--- .../suite/fixtures/recorded/languages/java/takeIf.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeItem.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeList.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeMap.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeName.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeName2.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeName3.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeState.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeString.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeType.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeType2.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeType3.yml | 7 ++++--- .../fixtures/recorded/languages/java/takeValue.yml | 7 ++++--- .../recorded/languages/java/tryCatchWrapThis.yml | 7 ++++--- .../recorded/languages/java/tryCatchWrapThis2.yml | 7 ++++--- .../fixtures/recorded/languages/json/takeItem.yml | 7 ++++--- .../fixtures/recorded/languages/json/takeItem2.yml | 7 ++++--- .../fixtures/recorded/languages/json/takeKey.yml | 7 ++++--- .../fixtures/recorded/languages/json/takeList.yml | 7 ++++--- .../fixtures/recorded/languages/json/takeString.yml | 7 ++++--- .../fixtures/recorded/languages/json/takeValue.yml | 7 ++++--- .../fixtures/recorded/languages/jsx/takeAttribute.yml | 7 ++++--- .../fixtures/recorded/languages/jsx/takeElement.yml | 7 ++++--- .../fixtures/recorded/languages/jsx/takeEndTag.yml | 7 ++++--- .../recorded/languages/jsx/takeEveryAttribute.yml | 7 ++++--- .../suite/fixtures/recorded/languages/jsx/takeKey.yml | 7 ++++--- .../fixtures/recorded/languages/jsx/takeStartTag.yml | 7 ++++--- .../fixtures/recorded/languages/jsx/takeTags.yml | 7 ++++--- .../fixtures/recorded/languages/jsx/takeValue.yml | 7 ++++--- .../fixtures/recorded/languages/python/chuckKey.yml | 7 ++++--- .../fixtures/recorded/languages/python/chuckKey2.yml | 7 ++++--- .../fixtures/recorded/languages/python/chuckType.yml | 7 ++++--- .../recorded/languages/python/chuckTypeSoon.yml | 7 ++++--- .../recorded/languages/python/chuckTypeTrap.yml | 7 ++++--- .../fixtures/recorded/languages/python/chuckValue.yml | 7 ++++--- .../recorded/languages/python/chuckValue2.yml | 7 ++++--- .../recorded/languages/python/clearEveryValue.yml | 7 ++++--- .../fixtures/recorded/languages/python/clearValue.yml | 7 ++++--- .../recorded/languages/python/clearValue2.yml | 7 ++++--- .../recorded/languages/python/elseStateWrapThis.yml | 7 ++++--- .../recorded/languages/python/ifElseWrapThis.yml | 7 ++++--- .../recorded/languages/python/ifStateWrapThis.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeArg.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeArg2.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeCall.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeClass.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeClass2.yml | 7 ++++--- .../recorded/languages/python/takeClassName.yml | 7 ++++--- .../recorded/languages/python/takeComment.yml | 7 ++++--- .../recorded/languages/python/takeCondition.yml | 7 ++++--- .../recorded/languages/python/takeCondition2.yml | 7 ++++--- .../recorded/languages/python/takeEveryArg.yml | 7 ++++--- .../recorded/languages/python/takeEveryArg2.yml | 7 ++++--- .../recorded/languages/python/takeEveryItem.yml | 7 ++++--- .../recorded/languages/python/takeEveryItem2.yml | 7 ++++--- .../recorded/languages/python/takeEveryItem3.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeFunk.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeFunk2.yml | 7 ++++--- .../recorded/languages/python/takeFunkName.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeIf.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeItem.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeItem2.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeItem3.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeKey.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeLambda.yml | 7 ++++--- .../recorded/languages/python/takeLambdaMade.yml | 7 ++++--- .../recorded/languages/python/takeLambdaPit.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeList.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeList2.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeMap.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeName.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeName2.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeName3.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeState.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeString.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeType.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeType2.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeValue.yml | 7 ++++--- .../fixtures/recorded/languages/python/takeValue2.yml | 7 ++++--- .../recorded/languages/python/takeValueZero.yml | 7 ++++--- .../recorded/languages/python/tryCatchWrapThis.yml | 7 ++++--- .../recorded/languages/python/tryCatchWrapThis2.yml | 7 ++++--- .../recorded/languages/typescript/chuckKey.yml | 7 ++++--- .../recorded/languages/typescript/chuckTypeRam.yml | 7 ++++--- .../recorded/languages/typescript/chuckTypeSoon.yml | 7 ++++--- .../recorded/languages/typescript/chuckTypeSoon2.yml | 7 ++++--- .../recorded/languages/typescript/chuckTypeTrap.yml | 7 ++++--- .../recorded/languages/typescript/chuckTypeYank.yml | 7 ++++--- .../recorded/languages/typescript/clearFunk.yml | 7 ++++--- .../recorded/languages/typescript/clearFunk2.yml | 7 ++++--- .../recorded/languages/typescript/clearKey.yml | 7 ++++--- .../recorded/languages/typescript/clearLambda.yml | 7 ++++--- .../recorded/languages/typescript/clearLambda2.yml | 7 ++++--- .../recorded/languages/typescript/clearLambda3.yml | 7 ++++--- .../recorded/languages/typescript/clearLambda4.yml | 7 ++++--- .../languages/typescript/elseStateWrapThis.yml | 7 ++++--- .../recorded/languages/typescript/ifElseWrapThis.yml | 7 ++++--- .../recorded/languages/typescript/ifStateWrapThis.yml | 7 ++++--- .../recorded/languages/typescript/takeArg.yml | 7 ++++--- .../recorded/languages/typescript/takeArg2.yml | 7 ++++--- .../recorded/languages/typescript/takeArrow.yml | 7 ++++--- .../recorded/languages/typescript/takeCall.yml | 7 ++++--- .../recorded/languages/typescript/takeClass.yml | 7 ++++--- .../recorded/languages/typescript/takeClassName.yml | 7 ++++--- .../recorded/languages/typescript/takeComment.yml | 7 ++++--- .../recorded/languages/typescript/takeCondition.yml | 7 ++++--- .../recorded/languages/typescript/takeCondition2.yml | 7 ++++--- .../recorded/languages/typescript/takeCondition3.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryArgAir.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryArgBat.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryArgRam.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryItem.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryItem2.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryItem3.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryItem4.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryItem5.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryKey.yml | 7 ++++--- .../recorded/languages/typescript/takeEveryValue.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk10.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk11.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk12.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk13.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk2.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk3.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk4.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk5.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk6.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk7.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk8.yml | 7 ++++--- .../recorded/languages/typescript/takeFunk9.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName10.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName11.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName2.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName3.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName4.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName5.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName6.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName7.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName8.yml | 7 ++++--- .../recorded/languages/typescript/takeFunkName9.yml | 7 ++++--- .../fixtures/recorded/languages/typescript/takeIf.yml | 7 ++++--- .../recorded/languages/typescript/takeItem.yml | 7 ++++--- .../recorded/languages/typescript/takeItem2.yml | 7 ++++--- .../recorded/languages/typescript/takeItem3.yml | 7 ++++--- .../recorded/languages/typescript/takeItem4.yml | 7 ++++--- .../recorded/languages/typescript/takeItemAir.yml | 7 ++++--- .../recorded/languages/typescript/takeItemBrace.yml | 7 ++++--- .../recorded/languages/typescript/takeItemComma.yml | 7 ++++--- .../recorded/languages/typescript/takeItemOne.yml | 7 ++++--- .../recorded/languages/typescript/takeKey.yml | 7 ++++--- .../recorded/languages/typescript/takeList.yml | 7 ++++--- .../recorded/languages/typescript/takeList2.yml | 7 ++++--- .../recorded/languages/typescript/takeMap.yml | 7 ++++--- .../recorded/languages/typescript/takeMap2.yml | 7 ++++--- .../recorded/languages/typescript/takeName.yml | 7 ++++--- .../recorded/languages/typescript/takeName2.yml | 7 ++++--- .../recorded/languages/typescript/takeRegex.yml | 7 ++++--- .../recorded/languages/typescript/takeState.yml | 7 ++++--- .../recorded/languages/typescript/takeString.yml | 7 ++++--- .../recorded/languages/typescript/takeType.yml | 7 ++++--- .../recorded/languages/typescript/takeType2.yml | 7 ++++--- .../recorded/languages/typescript/takeValue.yml | 7 ++++--- .../recorded/languages/typescript/takeValue2.yml | 7 ++++--- .../recorded/languages/typescript/takeValue3.yml | 7 ++++--- .../recorded/languages/typescript/takeValue4.yml | 7 ++++--- .../languages/typescript/tryCatchWrapThis.yml | 7 ++++--- .../languages/typescript/tryCatchWrapThis2.yml | 7 ++++--- .../fixtures/recorded/lineEndings/chuckVestLF.yml | 7 ++++--- .../fixtures/recorded/lineEndings/chuckVestLFCR.yml | 7 ++++--- .../fixtures/recorded/lineEndings/dropVestLF.yml | 7 ++++--- .../fixtures/recorded/lineEndings/dropVestLFCR.yml | 7 ++++--- .../suite/fixtures/recorded/marks/takeDownOne.yml | 7 ++++--- .../fixtures/recorded/marks/takeDownOnePastThree.yml | 7 ++++--- .../suite/fixtures/recorded/marks/takeRowFive.yml | 7 ++++--- .../suite/fixtures/recorded/marks/takeRowFour.yml | 7 ++++--- src/test/suite/fixtures/recorded/marks/takeRowOne.yml | 7 ++++--- .../recorded/marks/takeRowTwoPastDownThree.yml | 7 ++++--- .../fixtures/recorded/marks/takeRowTwoPastFour.yml | 7 ++++--- src/test/suite/fixtures/recorded/marks/takeSource.yml | 7 ++++--- src/test/suite/fixtures/recorded/marks/takeThat.yml | 7 ++++--- src/test/suite/fixtures/recorded/marks/takeThis.yml | 7 ++++--- .../fixtures/recorded/marks/takeUpOnePastDownOne.yml | 7 ++++--- .../fixtures/recorded/marks/takeUpOnePastRowFour.yml | 7 ++++--- .../recorded/positions/chuckAfterBlockVest.yml | 7 ++++--- .../fixtures/recorded/positions/chuckAfterHarp.yml | 7 ++++--- .../recorded/positions/chuckAfterLineVest.yml | 7 ++++--- .../fixtures/recorded/positions/chuckAfterLook.yml | 7 ++++--- .../fixtures/recorded/positions/chuckAfterVest.yml | 7 ++++--- .../suite/fixtures/recorded/positions/chuckAir.yml | 7 ++++--- .../fixtures/recorded/positions/chuckBeforeAir.yml | 7 ++++--- .../recorded/positions/chuckBeforeBlockAir.yml | 7 ++++--- .../fixtures/recorded/positions/chuckBeforeEach.yml | 7 ++++--- .../fixtures/recorded/positions/chuckBeforeHarp.yml | 7 ++++--- .../recorded/positions/chuckBeforeLineAir.yml | 7 ++++--- .../fixtures/recorded/positions/chuckBeforeVest.yml | 7 ++++--- .../recorded/positions/chuckPastAfterLook.yml | 7 ++++--- .../recorded/positions/chuckPastBeforeTrap.yml | 7 ++++--- .../recorded/positions/chuckPastEndOfLine.yml | 7 ++++--- .../recorded/positions/chuckPastEndOfLook.yml | 7 ++++--- .../recorded/positions/chuckPastStartOfTrap.yml | 7 ++++--- .../recorded/positions/replaceAfterVestWithHallo.yml | 7 ++++--- .../recorded/positions/replaceBeforeVestWithHello.yml | 7 ++++--- .../recorded/positions/replaceEndOfVestWithHello.yml | 7 ++++--- .../positions/replaceStartOfVestWithHello.yml | 7 ++++--- .../bringAirToAfterColumnBatPastFine.yml | 7 ++++--- .../bringAirToBeforeColumnBatPastFine.yml | 7 ++++--- .../selectionTypes/bringAirToColumnBatPastFine.yml | 7 ++++--- .../bringAirToEndOfColumnBatPastFine.yml | 7 ++++--- .../bringAirToStartOfColumnBatPastFine.yml | 7 ++++--- .../recorded/selectionTypes/chuckBlockAir.yml | 7 ++++--- .../recorded/selectionTypes/chuckBlockAir2.yml | 7 ++++--- .../recorded/selectionTypes/chuckBlockVest.yml | 7 ++++--- .../fixtures/recorded/selectionTypes/chuckFile.yml | 7 ++++--- .../recorded/selectionTypes/chuckLineVest.yml | 7 ++++--- .../recorded/selectionTypes/chuckLineVest2.yml | 7 ++++--- .../recorded/selectionTypes/chuckTokenVest.yml | 7 ++++--- .../fixtures/recorded/selectionTypes/drinkCell.yml | 7 ++++--- .../recorded/selectionTypes/drinkCellEach.yml | 7 ++++--- .../selectionTypes/postColumnWhaleUntilEach.yml | 7 ++++--- .../fixtures/recorded/selectionTypes/pourCell.yml | 7 ++++--- .../fixtures/recorded/selectionTypes/pourCellEach.yml | 7 ++++--- .../fixtures/recorded/selectionTypes/takeBlockAir.yml | 7 ++++--- .../recorded/selectionTypes/takeColumnAirPastEach.yml | 7 ++++--- .../recorded/selectionTypes/takeColumnLookPastAir.yml | 7 ++++--- .../recorded/selectionTypes/takeColumnUntilEach.yml | 7 ++++--- .../selectionTypes/takeColumnWhaleBetweenRam.yml | 7 ++++--- .../fixtures/recorded/selectionTypes/takeFile.yml | 7 ++++--- .../fixtures/recorded/selectionTypes/takeLineVest.yml | 7 ++++--- .../recorded/selectionTypes/takeTokenVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/chuckFirstCharVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/chuckFirstWordVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/chuckLastCharVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/chuckLastWordVest.yml | 7 ++++--- .../recorded/subtoken/chuckSecondWordVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/chuckSixthCharVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/clearFirstCharVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/clearFirstWordVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/clearLastCharVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/clearLastWordVest.yml | 7 ++++--- .../recorded/subtoken/clearSecondWordVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/clearSixthCharVest.yml | 7 ++++--- .../fixtures/recorded/subtoken/takeFirstChar.yml | 7 ++++--- .../fixtures/recorded/subtoken/takeFirstChar2.yml | 7 ++++--- .../fixtures/recorded/subtoken/takeFirstChar3.yml | 7 ++++--- .../fixtures/recorded/subtoken/takeFirstChar4.yml | 7 ++++--- .../fixtures/recorded/subtoken/takeFirstChar5.yml | 7 ++++--- .../recorded/subtoken/takeFirstPastLastCharHarp.yml | 7 ++++--- .../recorded/subtoken/takeFirstPastLastWordHarp.yml | 7 ++++--- .../recorded/subtoken/takeFirstPastSecondWordHarp.yml | 7 ++++--- .../recorded/subtoken/takeFirstThreeCharHarp.yml | 7 ++++--- .../recorded/subtoken/takeFirstTwoWordHarp.yml | 7 ++++--- .../fixtures/recorded/subtoken/takeFirstWord.yml | 7 ++++--- .../recorded/subtoken/takeLastPastFirstCharHarp.yml | 7 ++++--- .../recorded/subtoken/takeLastPastFirstWordHarp.yml | 7 ++++--- .../recorded/subtoken/takeLastThreeCharHarp.yml | 7 ++++--- .../recorded/subtoken/takeLastTwoWordHarp.yml | 7 ++++--- .../subtoken/takeSecondCharLookPastEndOfToken.yml | 7 ++++--- .../subtoken/takeSecondCharLookPastSecondCharTrap.yml | 7 ++++--- .../fixtures/recorded/subtoken/takeSecondWord.yml | 7 ++++--- .../recorded/subtoken/takeThirdPastSecondWordHarp.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair10.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair11.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair12.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair13.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair14.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair15.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair16.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair17.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair2.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair3.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair4.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair5.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair6.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair7.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair8.yml | 7 ++++--- .../recorded/surroundingPair/html/clearPair9.yml | 7 ++++--- .../surroundingPair/parseTree/cpp/clearOutside.yml | 7 ++++--- .../surroundingPair/parseTree/cpp/clearRound8.yml | 7 ++++--- .../surroundingPair/parseTree/java/clearQuad3.yml | 7 ++++--- .../surroundingPair/parseTree/java/clearRound10.yml | 7 ++++--- .../surroundingPair/parseTree/java/clearRound11.yml | 7 ++++--- .../parseTree/python/chuckMatching.yml | 7 ++++--- .../parseTree/python/chuckMatching2.yml | 7 ++++--- .../parseTree/python/chuckMatching3.yml | 7 ++++--- .../surroundingPair/parseTree/python/chuckPair.yml | 7 ++++--- .../surroundingPair/parseTree/python/chuckRound.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearCurly.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearCurly3.yml | 7 ++++--- .../parseTree/python/clearMatching.yml | 7 ++++--- .../parseTree/python/clearMatching10.yml | 7 ++++--- .../parseTree/python/clearMatching11.yml | 7 ++++--- .../parseTree/python/clearMatching2.yml | 7 ++++--- .../parseTree/python/clearMatching3.yml | 7 ++++--- .../parseTree/python/clearMatching4.yml | 7 ++++--- .../parseTree/python/clearMatching5.yml | 7 ++++--- .../parseTree/python/clearMatching6.yml | 7 ++++--- .../parseTree/python/clearMatching7.yml | 7 ++++--- .../parseTree/python/clearMatching8.yml | 7 ++++--- .../parseTree/python/clearMatching9.yml | 7 ++++--- .../parseTree/python/clearOutside7.yml | 7 ++++--- .../parseTree/python/clearOutside8.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearPair.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearPair2.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearPair3.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearPair4.yml | 7 ++++--- .../parseTree/python/clearPairCurly.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearQuad2.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearQuad4.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearRound.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearRound5.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearRound6.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearRound7.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearSquare.yml | 7 ++++--- .../surroundingPair/parseTree/python/clearSquare2.yml | 7 ++++--- .../parseTree/shellscript/clearCurly4.yml | 7 ++++--- .../parseTree/shellscript/clearOutside23.yml | 7 ++++--- .../parseTree/shellscript/clearPair.yml | 7 ++++--- .../parseTree/shellscript/clearString5.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair10.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair11.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair12.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair13.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair14.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair15.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair16.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair17.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair18.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair19.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair20.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair21.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair23.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair4.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair5.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair6.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair7.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair8.yml | 7 ++++--- .../surroundingPair/parseTree/tsx/clearPair9.yml | 7 ++++--- .../parseTree/typescript/clearMatching14.yml | 7 ++++--- .../parseTree/typescript/clearMatching15.yml | 7 ++++--- .../parseTree/typescript/clearOutside10.yml | 7 ++++--- .../parseTree/typescript/clearOutside11.yml | 7 ++++--- .../parseTree/typescript/clearOutside12.yml | 7 ++++--- .../parseTree/typescript/clearOutside13.yml | 7 ++++--- .../parseTree/typescript/clearOutside14.yml | 7 ++++--- .../parseTree/typescript/clearOutside15.yml | 7 ++++--- .../parseTree/typescript/clearOutside16.yml | 7 ++++--- .../parseTree/typescript/clearOutside17.yml | 7 ++++--- .../parseTree/typescript/clearOutside18.yml | 7 ++++--- .../parseTree/typescript/clearOutside19.yml | 7 ++++--- .../parseTree/typescript/clearOutside2.yml | 7 ++++--- .../parseTree/typescript/clearOutside20.yml | 7 ++++--- .../parseTree/typescript/clearOutside21.yml | 7 ++++--- .../parseTree/typescript/clearOutside22.yml | 7 ++++--- .../parseTree/typescript/clearOutside3.yml | 7 ++++--- .../parseTree/typescript/clearOutside4.yml | 7 ++++--- .../parseTree/typescript/clearOutside5.yml | 7 ++++--- .../parseTree/typescript/clearOutside6.yml | 7 ++++--- .../parseTree/typescript/clearOutside9.yml | 7 ++++--- .../parseTree/typescript/clearPair.yml | 7 ++++--- .../parseTree/typescript/clearPair2.yml | 7 ++++--- .../parseTree/typescript/clearPair3.yml | 7 ++++--- .../parseTree/typescript/clearPair4.yml | 7 ++++--- .../parseTree/typescript/clearPair5.yml | 7 ++++--- .../parseTree/typescript/clearPair6.yml | 7 ++++--- .../parseTree/typescript/clearPair7.yml | 7 ++++--- .../parseTree/typescript/clearQuad.yml | 7 ++++--- .../parseTree/typescript/clearRound2.yml | 7 ++++--- .../parseTree/typescript/clearRound3.yml | 7 ++++--- .../parseTree/typescript/clearRound4.yml | 7 ++++--- .../parseTree/typescript/clearSkis.yml | 7 ++++--- .../parseTree/typescript/clearSquare3.yml | 7 ++++--- .../parseTree/typescript/clearSquare4.yml | 7 ++++--- .../parseTree/typescript/clearSquare5.yml | 7 ++++--- .../parseTree/typescript/clearSquareLack.yml | 7 ++++--- .../parseTree/typescript/clearSquareRack.yml | 7 ++++--- .../parseTree/typescript/clearString.yml | 7 ++++--- .../parseTree/typescript/clearString2.yml | 7 ++++--- .../parseTree/typescript/clearString3.yml | 7 ++++--- .../parseTreeParity/chuckInsideRound.yml | 7 ++++--- .../parseTreeParity/chuckPairRound.yml | 7 ++++--- .../surroundingPair/parseTreeParity/chuckRound2.yml | 7 ++++--- .../surroundingPair/parseTreeParity/clearCurly2.yml | 7 ++++--- .../parseTreeParity/clearOutsideGreenDouble.yml | 10 ++++++---- .../surroundingPair/parseTreeParity/clearRound9.yml | 7 ++++--- .../parseTreeParity/takeInsideRound.yml | 8 ++++---- .../parseTreeParity/takeInsideRound2.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside11.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside12.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside13.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside14.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside15.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside16.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside17.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside18.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside19.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside2.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside20.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside21.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside22.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside23.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside24.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside25.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside26.yml | 7 ++++--- .../surroundingPair/parseTreeParity/takeOutside3.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside4.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside5.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside6.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside7.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside8.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeOutside9.yml | 8 ++++---- .../parseTreeParity/takeOutsideLeper.yml | 11 ++++------- .../parseTreeParity/takeOutsideRack.yml | 11 ++++------- .../parseTreeParity/takePairDouble.yml | 11 ++++------- .../surroundingPair/parseTreeParity/takePairRound.yml | 8 ++++---- .../parseTreeParity/takePairRound2.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeQuad.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeQuad2.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeQuad3.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeQuad4.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeQuad5.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeQuad6.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound10.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound11.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound12.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound13.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound14.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound15.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound16.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound17.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound18.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound19.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound2.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound20.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound21.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound22.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound23.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound3.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound4.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound5.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound6.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound7.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound8.yml | 8 ++++---- .../surroundingPair/parseTreeParity/takeRound9.yml | 8 ++++---- .../parseTreeParity/takeRoundLeper.yml | 11 ++++------- .../parseTreeParity/takeRoundRepper.yml | 11 ++++------- .../surroundingPair/parseTreeParity/takeSquare.yml | 8 ++++---- .../surroundingPair/textual/chuckInsideRound.yml | 7 ++++--- .../surroundingPair/textual/chuckPairRound.yml | 7 ++++--- .../recorded/surroundingPair/textual/chuckRound2.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearCurly2.yml | 7 ++++--- .../textual/clearOutsideGreenDouble.yml | 10 ++++++---- .../recorded/surroundingPair/textual/clearPair.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair10.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair11.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair12.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair13.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair14.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair2.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair3.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair4.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair5.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair6.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair7.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair8.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearPair9.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearRound.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearRound9.yml | 7 ++++--- .../recorded/surroundingPair/textual/clearString4.yml | 7 ++++--- .../surroundingPair/textual/tailTakeEscapedQuad.yml | 8 ++++---- .../surroundingPair/textual/takeEscapedQuad.yml | 8 ++++---- .../surroundingPair/textual/takeEscapedQuad2.yml | 8 ++++---- .../surroundingPair/textual/takeEscapedQuad3.yml | 8 ++++---- .../surroundingPair/textual/takeEscapedQuad4.yml | 8 ++++---- .../surroundingPair/textual/takeEscapedQuad5.yml | 8 ++++---- .../surroundingPair/textual/takeInsideRound.yml | 8 ++++---- .../surroundingPair/textual/takeInsideRound2.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeLeftQuad.yml | 7 ++++--- .../surroundingPair/textual/takeLeftQuad2.yml | 7 ++++--- .../surroundingPair/textual/takeLeftQuad3.yml | 7 ++++--- .../surroundingPair/textual/takeLeftQuad4.yml | 7 ++++--- .../surroundingPair/textual/takeLeftQuad5.yml | 7 ++++--- .../surroundingPair/textual/takeLeftQuad6.yml | 7 ++++--- .../surroundingPair/textual/takeLeftQuad7.yml | 7 ++++--- .../recorded/surroundingPair/textual/takeOutside.yml | 8 ++++---- .../surroundingPair/textual/takeOutside10.yml | 8 ++++---- .../surroundingPair/textual/takeOutside11.yml | 7 ++++--- .../surroundingPair/textual/takeOutside12.yml | 7 ++++--- .../surroundingPair/textual/takeOutside13.yml | 7 ++++--- .../surroundingPair/textual/takeOutside14.yml | 7 ++++--- .../surroundingPair/textual/takeOutside15.yml | 7 ++++--- .../surroundingPair/textual/takeOutside16.yml | 7 ++++--- .../surroundingPair/textual/takeOutside17.yml | 7 ++++--- .../surroundingPair/textual/takeOutside18.yml | 7 ++++--- .../surroundingPair/textual/takeOutside19.yml | 7 ++++--- .../recorded/surroundingPair/textual/takeOutside2.yml | 8 ++++---- .../surroundingPair/textual/takeOutside20.yml | 7 ++++--- .../surroundingPair/textual/takeOutside21.yml | 7 ++++--- .../surroundingPair/textual/takeOutside22.yml | 7 ++++--- .../surroundingPair/textual/takeOutside23.yml | 7 ++++--- .../surroundingPair/textual/takeOutside24.yml | 7 ++++--- .../surroundingPair/textual/takeOutside25.yml | 7 ++++--- .../surroundingPair/textual/takeOutside26.yml | 7 ++++--- .../surroundingPair/textual/takeOutside27.yml | 7 ++++--- .../recorded/surroundingPair/textual/takeOutside3.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeOutside4.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeOutside5.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeOutside6.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeOutside7.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeOutside8.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeOutside9.yml | 8 ++++---- .../surroundingPair/textual/takeOutsideFine.yml | 10 ++++++---- .../surroundingPair/textual/takeOutsideLeper.yml | 11 ++++------- .../surroundingPair/textual/takeOutsideRack.yml | 11 ++++------- .../surroundingPair/textual/takeOutsideUrge.yml | 10 ++++++---- .../surroundingPair/textual/takePairDouble.yml | 11 ++++------- .../surroundingPair/textual/takePairRound.yml | 8 ++++---- .../surroundingPair/textual/takePairRound2.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeQuad.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeQuad2.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeQuad3.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeQuad4.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeQuad5.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeQuad6.yml | 8 ++++---- .../surroundingPair/textual/takeRightQuad.yml | 7 ++++--- .../surroundingPair/textual/takeRightQuad2.yml | 7 ++++--- .../surroundingPair/textual/takeRightQuad3.yml | 7 ++++--- .../surroundingPair/textual/takeRightQuad4.yml | 7 ++++--- .../surroundingPair/textual/takeRightQuad5.yml | 7 ++++--- .../surroundingPair/textual/takeRightQuad6.yml | 7 ++++--- .../surroundingPair/textual/takeRightQuad7.yml | 7 ++++--- .../recorded/surroundingPair/textual/takeRound.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound10.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound11.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound12.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound13.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound14.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound15.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound16.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound17.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound18.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound19.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound2.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound20.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound21.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound22.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound23.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound3.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound4.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound5.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound6.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound7.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound8.yml | 8 ++++---- .../recorded/surroundingPair/textual/takeRound9.yml | 8 ++++---- .../surroundingPair/textual/takeRoundLeper.yml | 11 ++++------- .../surroundingPair/textual/takeRoundRepper.yml | 11 ++++------- .../recorded/surroundingPair/textual/takeSquare.yml | 8 ++++---- .../fixtures/recorded/updateSelections/bringFine.yml | 7 ++++--- .../updateSelections/bringFineAfterThirdCarThis.yml | 7 ++++--- .../recorded/updateSelections/bringFineAfterThis.yml | 7 ++++--- .../recorded/updateSelections/bringFineAfterThis2.yml | 7 ++++--- .../recorded/updateSelections/bringFineBeforeThis.yml | 7 ++++--- .../updateSelections/bringFineToFirstCarWhale.yml | 7 ++++--- .../updateSelections/bringFineToFirstTwoCar.yml | 7 ++++--- .../updateSelections/bringFineToLastCarWhale.yml | 7 ++++--- .../updateSelections/bringFineToLastTwoCar.yml | 7 ++++--- .../updateSelections/bringFineToThirdCarWhale.yml | 7 ++++--- .../recorded/updateSelections/bringFineToWhale.yml | 7 ++++--- .../recorded/updateSelections/bringFineToWhale2.yml | 7 ++++--- .../recorded/updateSelections/bringFineToWhale3.yml | 7 ++++--- .../recorded/updateSelections/bringFineToWhale4.yml | 7 ++++--- .../recorded/updateSelections/bringFineToWhale5.yml | 7 ++++--- .../updateSelections/bringHarpToEndOfWhale.yml | 7 ++++--- .../bringHarpToFourthCarWhalePastSecondCarHarp.yml | 7 ++++--- .../bringHarpToSecondCarFinePastThirdCarHarp.yml | 7 ++++--- .../bringHarpToSecondCarFinePastThirdCarWhale.yml | 7 ++++--- .../updateSelections/bringHarpToStartOfWhale.yml | 7 ++++--- .../fixtures/recorded/updateSelections/bringWhale.yml | 7 ++++--- .../recorded/updateSelections/bringWhaleAfterFine.yml | 7 ++++--- .../recorded/updateSelections/bringWhaleAfterThis.yml | 7 ++++--- .../updateSelections/bringWhaleAfterThis2.yml | 7 ++++--- .../updateSelections/bringWhaleBeforeThis.yml | 7 ++++--- .../updateSelections/bringWhaleToEndOfFine.yml | 7 ++++--- .../recorded/updateSelections/bringWhaleToFine.yml | 7 ++++--- .../recorded/updateSelections/chuckFirstCarWhale.yml | 7 ++++--- .../updateSelections/chuckFirstPastSecondCar.yml | 7 ++++--- .../updateSelections/chuckFourthPastFifthCar.yml | 7 ++++--- .../recorded/updateSelections/chuckLastCarWhale.yml | 7 ++++--- .../chuckSecondCarFinePastThirdCarWhale.yml | 7 ++++--- .../updateSelections/chuckSecondPastThirdCar.yml | 7 ++++--- .../chuckThirdCarWhalePastSecondCarHarp.yml | 7 ++++--- .../recorded/updateSelections/commentTrap.yml | 7 ++++--- src/util/canonicalizeAndValidateCommand.ts | 7 +++++++ 810 files changed, 3257 insertions(+), 2569 deletions(-) diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml index a376eb3ab5..b314d48a04 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml index 6a9b28a48d..fcda3b0f4e 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml index 055e49c06f..ad598c36a7 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml index 8f3cfefe3a..09a6bb4ea4 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml index c04aeabd7c..fa8cf1a4ae 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml index ed8e02337c..b7d32def05 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml index 58898ddbcb..b4c9d1219a 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringVest.yml b/src/test/suite/fixtures/recorded/actions/bringVest.yml index 56f3364f2f..93ac7b1f6b 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 diff --git a/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml b/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml index f81b3163e1..58f4e62450 100644 --- a/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml +++ b/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/callFine.yml b/src/test/suite/fixtures/recorded/actions/callFine.yml index 1319cceeed..0428833ea6 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 diff --git a/src/test/suite/fixtures/recorded/actions/callVest.yml b/src/test/suite/fixtures/recorded/actions/callVest.yml index 66022e8345..b538e73600 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 diff --git a/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml b/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml index 0233e03694..01e9f37041 100644 --- a/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml +++ b/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/carveVest.yml b/src/test/suite/fixtures/recorded/actions/carveVest.yml index d94dbe8846..0397f9089a 100644 --- a/src/test/suite/fixtures/recorded/actions/carveVest.yml +++ b/src/test/suite/fixtures/recorded/actions/carveVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/chuckVest.yml b/src/test/suite/fixtures/recorded/actions/chuckVest.yml index 8725734116..294c5b37b9 100644 --- a/src/test/suite/fixtures/recorded/actions/chuckVest.yml +++ b/src/test/suite/fixtures/recorded/actions/chuckVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/clearVest.yml b/src/test/suite/fixtures/recorded/actions/clearVest.yml index 1391da55c6..8ca4e8ef44 100644 --- a/src/test/suite/fixtures/recorded/actions/clearVest.yml +++ b/src/test/suite/fixtures/recorded/actions/clearVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/commentVest.yml b/src/test/suite/fixtures/recorded/actions/commentVest.yml index 624d5cbca5..eca5e6745b 100644 --- a/src/test/suite/fixtures/recorded/actions/commentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/commentVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/copyVest.yml b/src/test/suite/fixtures/recorded/actions/copyVest.yml index d739bd99a6..fc4602c808 100644 --- a/src/test/suite/fixtures/recorded/actions/copyVest.yml +++ b/src/test/suite/fixtures/recorded/actions/copyVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/dedentVest.yml b/src/test/suite/fixtures/recorded/actions/dedentVest.yml index b6e7db9c23..cd2a06b0a0 100644 --- a/src/test/suite/fixtures/recorded/actions/dedentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dedentVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/drinkVest.yml b/src/test/suite/fixtures/recorded/actions/drinkVest.yml index c695de294d..0823b52cf1 100644 --- a/src/test/suite/fixtures/recorded/actions/drinkVest.yml +++ b/src/test/suite/fixtures/recorded/actions/drinkVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/dropVest.yml b/src/test/suite/fixtures/recorded/actions/dropVest.yml index 86b3d69d31..a58e3c1ae3 100644 --- a/src/test/suite/fixtures/recorded/actions/dropVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dropVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml b/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml index 1247ce2f71..3a44a8dc69 100644 --- a/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/dupeVest.yml b/src/test/suite/fixtures/recorded/actions/dupeVest.yml index 70707dcbaf..60546918ef 100644 --- a/src/test/suite/fixtures/recorded/actions/dupeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dupeVest.yml @@ -1,8 +1,9 @@ -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: [] 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..2a108e3112 100644 --- a/src/test/suite/fixtures/recorded/actions/floatVest.yml +++ b/src/test/suite/fixtures/recorded/actions/floatVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml b/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml index 5aa3197513..c53cfec482 100644 --- a/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml @@ -1,8 +1,9 @@ -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: .} diff --git a/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml b/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml index 8b7964aee6..9527300319 100644 --- a/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml +++ b/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/giveBat.yml b/src/test/suite/fixtures/recorded/actions/giveBat.yml index 32397e6f61..125ea064bf 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBat.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBat.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveBat2.yml b/src/test/suite/fixtures/recorded/actions/giveBat2.yml index 92c9f6a3e2..18c60b256a 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBat2.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBat2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml b/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml index adc946f7cc..9ee7f16dea 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml @@ -1,8 +1,9 @@ -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: .} diff --git a/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml b/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml index 0a641e0bbe..b4605ece34 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml b/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml index a266cfa2b7..6cc636fc3b 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/giveCap.yml b/src/test/suite/fixtures/recorded/actions/giveCap.yml index a3dd49fe22..5fb62bbb60 100644 --- a/src/test/suite/fixtures/recorded/actions/giveCap.yml +++ b/src/test/suite/fixtures/recorded/actions/giveCap.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveDot.yml b/src/test/suite/fixtures/recorded/actions/giveDot.yml index 781a750ab2..db59bf797e 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDot.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveDot2.yml b/src/test/suite/fixtures/recorded/actions/giveDot2.yml index ab86d920cc..79c54bb257 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDot2.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDot2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveDrum.yml b/src/test/suite/fixtures/recorded/actions/giveDrum.yml index 423f36a96e..9adbcbc26a 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDrum.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml b/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml index b0c2db908d..1a8a8629f0 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 diff --git a/src/test/suite/fixtures/recorded/actions/giveHarp.yml b/src/test/suite/fixtures/recorded/actions/giveHarp.yml index bd762abe8b..eb1172ddf1 100644 --- a/src/test/suite/fixtures/recorded/actions/giveHarp.yml +++ b/src/test/suite/fixtures/recorded/actions/giveHarp.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml b/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml index 5ac60b5e1b..7e0caece70 100644 --- a/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml +++ b/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/giveQuote.yml b/src/test/suite/fixtures/recorded/actions/giveQuote.yml index a849d8ea1b..66bacfb60a 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuote.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml b/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml index 3f01618a74..bc8c148a66 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml b/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml index 95eabb62f3..55866a2a6c 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml b/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml index 3a18df2a9f..751f8e3ce1 100644 --- a/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml +++ b/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/indentVest.yml b/src/test/suite/fixtures/recorded/actions/indentVest.yml index 1ad5dcf980..06ec948f09 100644 --- a/src/test/suite/fixtures/recorded/actions/indentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/indentVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/moveVest.yml b/src/test/suite/fixtures/recorded/actions/moveVest.yml index 1da2586e1f..84776a553a 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 diff --git a/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml b/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml index b2be76f24b..65adb75eca 100644 --- a/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml +++ b/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/pasteCap.yml b/src/test/suite/fixtures/recorded/actions/pasteCap.yml index ff9a7c8750..4b7ad4531b 100644 --- a/src/test/suite/fixtures/recorded/actions/pasteCap.yml +++ b/src/test/suite/fixtures/recorded/actions/pasteCap.yml @@ -1,8 +1,9 @@ -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: [] 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..eda32ac6fb 100644 --- a/src/test/suite/fixtures/recorded/actions/postVest.yml +++ b/src/test/suite/fixtures/recorded/actions/postVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/pourVest.yml b/src/test/suite/fixtures/recorded/actions/pourVest.yml index 8b309f5d4a..ebd82e1e3c 100644 --- a/src/test/suite/fixtures/recorded/actions/pourVest.yml +++ b/src/test/suite/fixtures/recorded/actions/pourVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/preeVest.yml b/src/test/suite/fixtures/recorded/actions/preeVest.yml index 7484651753..87143b9e72 100644 --- a/src/test/suite/fixtures/recorded/actions/preeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/preeVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/actions/puffVest.yml b/src/test/suite/fixtures/recorded/actions/puffVest.yml index efd898b894..8c7567c6de 100644 --- a/src/test/suite/fixtures/recorded/actions/puffVest.yml +++ b/src/test/suite/fixtures/recorded/actions/puffVest.yml @@ -1,8 +1,9 @@ -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: [] 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..631d1152c5 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 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..0c698a48dc 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 diff --git a/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml b/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml index 187ffc7409..24ea469cba 100644 --- a/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml +++ b/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/actions/swapWithVest.yml b/src/test/suite/fixtures/recorded/actions/swapWithVest.yml index 1f5d5e6eea..5a67015967 100644 --- a/src/test/suite/fixtures/recorded/actions/swapWithVest.yml +++ b/src/test/suite/fixtures/recorded/actions/swapWithVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/actions/takeVest.yml b/src/test/suite/fixtures/recorded/actions/takeVest.yml index 4d71b42952..112c74ff93 100644 --- a/src/test/suite/fixtures/recorded/actions/takeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/takeVest.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml index 2eb64d51e0..54c53532a8 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml index ca3f7bfe6d..820938d4f9 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml index b12a277f53..95e03ac735 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml index e5a7db1b42..5354674e0f 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml index d36cec1872..f433b182f8 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml b/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml index 62b0a503f1..1eb281001c 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml b/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml index 8589e57cd0..467f51d0cf 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml index 69d8f23455..e427252792 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: diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml index 7e52560132..9f8345e2ea 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: diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml index a2d74dc533..3ad9dfa34f 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml index 841d68fd59..2abefb523a 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml index 16a5792d6f..14b7959447 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 diff --git a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml index ded501aa59..dd3dfebb52 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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml index 937bd26405..325aa9596e 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml index c48fc74c3c..392e0ea977 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml index eca69672ca..7fba543618 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml index abbfd69cc1..aa9fb6c34c 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml index 8f37bffdf4..fb480137c3 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml index d49098c787..681b5b8e2d 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml index 6bce8c707f..3a5265187b 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml index 194c9e8863..3472ae39b2 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml index 8271800bdc..ba045e698d 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml index 2484d054e2..97eab19696 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml index fc74728dbe..59adc9d764 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml index c91dc9cc19..cb26f92199 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml index b7cdefaaec..9fc12b12de 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml index 07481657de..7662a4c160 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml index 097d18db61..8399527ff5 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml index 86c0c32271..dc2d79b930 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml index 1fc693d2ef..f17a1fba1d 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml index 474e355a75..0741fd1415 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml index b9817d01c9..182c5b6588 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml index d488b6f9c2..25c147f131 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml index 7bfc932e76..95126fc9ee 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml index 23a0c5c3ee..9a9d04ef4d 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml index 3737d8dffc..87ce2b4e31 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml index 9e79b55e4c..f7c7313e29 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml index a57c75a739..c7ebab9917 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml index 63e6219c12..1707aa302b 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml index 5111678d47..34858d6494 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml index a9e6f8a4c6..4ca54fec0a 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml index e3ab2821c6..1498d6eb3c 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/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 diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml b/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml index 75524d1a6e..7f662380d6 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml @@ -1,11 +1,13 @@ -spokenForm: take harp languageId: plaintext command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take harp + action: setSelection + targets: - type: primitive - mark: {type: decoratedSymbol, symbolColor: default, character: h, usePrePhraseSnapshot: true} + mark: {type: decoratedSymbol, symbolColor: default, character: h} extraArgs: [] + usePrePhraseSnapshot: true initialState: documentContents: hello world selections: diff --git a/src/test/suite/fixtures/recorded/headTail/takeHead.yml b/src/test/suite/fixtures/recorded/headTail/takeHead.yml index 457acac3d7..92f5fa391b 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeHead.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeHead.yml @@ -1,8 +1,9 @@ -spokenForm: take head languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take head + action: setSelection + targets: - type: primitive modifier: {type: head} extraArgs: [] diff --git a/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml b/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml index 7fd58366e4..d4d1a2c760 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/headTail/takeTail.yml b/src/test/suite/fixtures/recorded/headTail/takeTail.yml index 53af0023cd..2b7f33193d 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeTail.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeTail.yml @@ -1,8 +1,9 @@ -spokenForm: take tail languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take tail + action: setSelection + targets: - type: primitive modifier: {type: tail} extraArgs: [] diff --git a/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml b/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml index 74acea8d1d..746d8f715c 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml b/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml index 141dfe762b..4fe728390b 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 diff --git a/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml b/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml index c9811b41e9..f80cf6c87f 100644 --- a/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml +++ b/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml b/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml index 69c2b584f8..1e24d18094 100644 --- a/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml +++ b/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml b/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml index 12f119dedd..199b24f882 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/inference/bringOddToState.yml b/src/test/suite/fixtures/recorded/inference/bringOddToState.yml index dd7fb6f415..d888238014 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToState.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToState.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml b/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml index 0894cee13a..996530f2ec 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml b/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml index 4a782e5cf9..610b10a5c6 100644 --- a/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml +++ b/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml @@ -1,8 +1,9 @@ -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} 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..8e38a200b5 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml index 07c2a52d1b..59f44d517f 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml b/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml index 86726beb05..8994934611 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml b/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml index 29700ca4b5..ddd88473e4 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml b/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml index 89b0834b95..54b51855d7 100644 --- a/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml +++ b/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml b/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml index 2006165640..09147aa133 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml b/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml index 44208159f7..d7d30ea34b 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeLastChar.yml b/src/test/suite/fixtures/recorded/inference/takeLastChar.yml index eaebcbc932..c8a67605d4 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLastChar.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLastChar.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml b/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml index 240f95ef94..87dda76e02 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: diff --git a/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml b/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml index aa2e3481a2..984a68db9d 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml b/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml index 186b7be1c0..25946ecdf3 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml index 69f32a1f77..2a947073b7 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml index 42597b3782..ff1cb2be46 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml index 8462c640e7..c25e0bc6bf 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml b/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml index db0f8f792f..2171bc9e35 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 diff --git a/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml b/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml index 5569239d09..f8e682f085 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: diff --git a/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml b/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml index ce714ce670..8744c06f64 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml b/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml index 72171695b6..e8bbd628fc 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml index 8486331e3a..f71eb4c6d9 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml index d3d43e329d..49dc9e5aa9 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml index 534abedac8..fc905ea2e9 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 diff --git a/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml b/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml index c167726b0b..22584e8d8b 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 diff --git a/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml b/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml index df80e9ecaf..f8c1755db7 100644 --- a/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml index 5a850aa113..5ef6ab55e4 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml index 9115afc69a..31bef30c37 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml @@ -1,8 +1,9 @@ -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} 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..c633ce6b79 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml index 9da517b735..5c26dce6e0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml index 879915f1b1..4d1a109bc9 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml index eadecca6df..5d845182eb 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml index 1b273fa54c..373444fa9a 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml index 29b2f593ff..ef4a7118f6 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml index 51fd70b055..dfd0365918 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml index c1ddfd3d3f..a638fab0e3 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml index 054ec779cf..e22dbf58a2 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml index b42c13105f..d49cff3b86 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml index 70fc48e3e9..95de817ef3 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml index cc91645dc8..b6cd01d064 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml index 3efc42de51..230f5c8695 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml index 122c9c8dd9..085efa8927 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml index 4842280ed9..ab99266135 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml index f2327971d2..b9ecef4bf6 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml index 0f0a065c17..973736c864 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml index 84ffbf7780..06fc16aa0c 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml index a90cd67dad..5918a995c7 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml index 5a1a892125..1fd60f54d8 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml index 212cf9c90a..a18c64c1e9 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml index 41beb7a690..84a220bdfb 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml index db9cdf6164..83ad7ed53f 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml index b8eb8f047d..c9f764ec78 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml index d8f9c016be..f37f9bdf1a 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml index a68c008027..6c9aed56c1 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml index 627e1d603c..6d1bafda21 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml index 2bcb3254bf..e85566cdc3 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml index 9a90c967fa..ad2d0b77bc 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml index 80108f8b52..381782602c 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml index b65f377445..fab11675dd 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml index 12995db166..89200c58ee 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml index b9b5891847..ec97bd875e 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml index 5a09b52d0a..eec9e98bb4 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml index 8e2ad63eca..66e56ebdcc 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml index e3f37d0553..5bcf3bdf00 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml index 5dafc6716d..fe4e63dea0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml @@ -1,8 +1,9 @@ -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: [] 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..8c9ade026f 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml index 614929dd17..5cb3208cb8 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml @@ -1,8 +1,9 @@ -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} 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..84e2099946 100644 --- a/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml +++ b/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml @@ -1,8 +1,9 @@ -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'} diff --git a/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml b/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml index b205764a11..fc6135e184 100644 --- a/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml +++ b/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml @@ -1,8 +1,9 @@ -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} 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..b89b9a04d9 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeArg.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml index 063bf41a91..f20881475b 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCall.yml b/src/test/suite/fixtures/recorded/languages/java/takeCall.yml index eba38f5fd1..3d5e4961cc 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCall.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeClass.yml b/src/test/suite/fixtures/recorded/languages/java/takeClass.yml index 7458eb8014..9b8ba90eec 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeClass.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml index a666f37446..0eec5f58fa 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeComment.yml b/src/test/suite/fixtures/recorded/languages/java/takeComment.yml index 1dc6256429..5f6d6aae09 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeComment.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml b/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml index 14ca6d2040..6595695ed3 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml b/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml index 15fabb6639..ea2c3fa052 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml b/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml index 835a5e75c5..6521eac34e 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml index 299bd302d1..9b1d43cdca 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml index aeeee7fd73..bd2ab0b151 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml index 98d478c843..371cdb4aaf 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml index d48016cccc..5ffd5bda6b 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml index 98d5d1dc94..f3c12cf42f 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml index ccba428c14..2725985ab2 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml b/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml index 7236d52a54..e72633dcb5 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeIf.yml b/src/test/suite/fixtures/recorded/languages/java/takeIf.yml index 7b9f7c7e91..f7d755caf6 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeIf.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeItem.yml b/src/test/suite/fixtures/recorded/languages/java/takeItem.yml index 2763cf7601..03cab5b838 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeList.yml b/src/test/suite/fixtures/recorded/languages/java/takeList.yml index 380dfd5f26..b26ee06ba4 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeList.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeMap.yml b/src/test/suite/fixtures/recorded/languages/java/takeMap.yml index 25866c448c..cc29dc3981 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeMap.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeName.yml b/src/test/suite/fixtures/recorded/languages/java/takeName.yml index b1287f95f3..8bd6e1955c 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeName2.yml b/src/test/suite/fixtures/recorded/languages/java/takeName2.yml index a478a5450a..1fcb562012 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeName3.yml b/src/test/suite/fixtures/recorded/languages/java/takeName3.yml index 2a540a22bb..fa8d06b98c 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeState.yml b/src/test/suite/fixtures/recorded/languages/java/takeState.yml index b4cbbd7c58..414c87f351 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeState.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeString.yml b/src/test/suite/fixtures/recorded/languages/java/takeString.yml index 5b2a00de1b..4b518e795a 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeString.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeType.yml b/src/test/suite/fixtures/recorded/languages/java/takeType.yml index ed47abc4da..5d6e42dcba 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeType2.yml b/src/test/suite/fixtures/recorded/languages/java/takeType2.yml index 5211288e31..58bd78da62 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeType3.yml b/src/test/suite/fixtures/recorded/languages/java/takeType3.yml index 91c7ecb8b2..e6ba340475 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/java/takeValue.yml b/src/test/suite/fixtures/recorded/languages/java/takeValue.yml index 129de8a49b..af62d9cd05 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeValue.yml @@ -1,8 +1,9 @@ -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: [] 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..f59734ad5a 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml index e596c35431..213450e009 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/json/takeKey.yml b/src/test/suite/fixtures/recorded/languages/json/takeKey.yml index e1f7d706e9..19cf73288c 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/json/takeList.yml b/src/test/suite/fixtures/recorded/languages/json/takeList.yml index d52adb14f1..20b738132d 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeList.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/json/takeString.yml b/src/test/suite/fixtures/recorded/languages/json/takeString.yml index 8ad0f1ebb1..46715f3eed 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeString.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/json/takeValue.yml b/src/test/suite/fixtures/recorded/languages/json/takeValue.yml index 2d097f6b5c..2cadf11204 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml index 64eb61580a..8abf188cc3 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml index c34cfc1b81..7cad36b307 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml index fd232a4141..a78f5aee60 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml index f3f73ea218..153b06d4c8 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml index f20ea9978e..b035d029f5 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml index 4cde8fac1b..374b314c09 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml index da00eb08e8..108616b48d 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml b/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml index a8c27dbf70..90ca1b6d92 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml b/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml index f22fc10dfd..716d02b3bc 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml b/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml index a4a0cbf99a..4cc229c3a7 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckType.yml b/src/test/suite/fixtures/recorded/languages/python/chuckType.yml index 39ae64bf80..131fdb857a 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckType.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckType.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml index 421714d67d..f8a688daa4 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml b/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml index 09c145d10c..2b35780c52 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml b/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml index 1bcd51aaaf..878b2e6a61 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml b/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml index f05e1dcd66..9cff9b5a2e 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml b/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml index 3da5bcfa73..cc37836e76 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/clearValue.yml b/src/test/suite/fixtures/recorded/languages/python/clearValue.yml index 77bd664c13..bed990b80a 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml b/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml index fce28308da..ab1f4db167 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml @@ -1,8 +1,9 @@ -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: [] 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..67339d486b 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeArg.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml index 95a1df540a..5e0960304d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeCall.yml b/src/test/suite/fixtures/recorded/languages/python/takeCall.yml index 12580c7160..f39b38d850 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCall.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeClass.yml b/src/test/suite/fixtures/recorded/languages/python/takeClass.yml index 0ea57000b3..9b2bdb3c35 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClass.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml b/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml index afa6b63920..831c1b8624 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml index 94146ccf54..aa9a8e5616 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeComment.yml b/src/test/suite/fixtures/recorded/languages/python/takeComment.yml index 28548f4698..d1c9aaea0d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeComment.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml b/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml index a25ae41afc..fce545aa9f 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml b/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml index 3368179015..db602ca6f9 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml index 71297d1bff..d1473ca29b 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml index 92a4254b7f..dfa5d0e1f2 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml index e5be4d7cf9..7eda585583 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml index be11b442b9..7d1f374616 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml index a673026297..5ca44bcc22 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml index 108f707a87..2e1ddaae47 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml index f75ff23acd..f97f2d4c5e 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml index 207b2b9ccc..032b3045e8 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeIf.yml b/src/test/suite/fixtures/recorded/languages/python/takeIf.yml index 1fbb205d91..c4962e1172 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeIf.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeItem.yml b/src/test/suite/fixtures/recorded/languages/python/takeItem.yml index 0a427bc305..5458a1335d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml index 880be0052d..187404be88 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml b/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml index 42749b500b..aa4719ef33 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeKey.yml b/src/test/suite/fixtures/recorded/languages/python/takeKey.yml index d304ba08e8..bd83c13c15 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml b/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml index cc1f3b60b0..21d799ce8c 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml b/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml index 11ce981c36..7f1aad4d10 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml b/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml index 123be90eff..008678d49f 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/python/takeList.yml b/src/test/suite/fixtures/recorded/languages/python/takeList.yml index 6cef2d88f1..980e3a939d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeList.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeList2.yml b/src/test/suite/fixtures/recorded/languages/python/takeList2.yml index 197fbbd9d7..2a8ecce94c 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeList2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeMap.yml b/src/test/suite/fixtures/recorded/languages/python/takeMap.yml index a42674ef4d..455235412a 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeMap.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeName.yml b/src/test/suite/fixtures/recorded/languages/python/takeName.yml index 19efb4e4e4..82a0eada92 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeName2.yml b/src/test/suite/fixtures/recorded/languages/python/takeName2.yml index a00990259d..98731e4e81 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeName3.yml b/src/test/suite/fixtures/recorded/languages/python/takeName3.yml index 0430face6d..d36e39b62c 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeState.yml b/src/test/suite/fixtures/recorded/languages/python/takeState.yml index 170a03ac03..7f8e588e93 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeState.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeString.yml b/src/test/suite/fixtures/recorded/languages/python/takeString.yml index 895f4b4c18..23354bffa3 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeString.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeType.yml b/src/test/suite/fixtures/recorded/languages/python/takeType.yml index 3b9bbfa4a4..abc87229b5 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeType.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeType2.yml b/src/test/suite/fixtures/recorded/languages/python/takeType2.yml index f6893713d1..7e5327c18c 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeType2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeValue.yml b/src/test/suite/fixtures/recorded/languages/python/takeValue.yml index 7d56dc8d76..2796ec3943 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml b/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml index cbad9b0e2a..a193f52b4e 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml b/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml index c93d0b9d0e..981cdb9ec5 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml @@ -1,8 +1,9 @@ -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'} 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..cea1300196 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml index 3de784ef28..aad77934a0 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml index 4381e6b83c..efbd00df43 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml index 05322105ea..e9e543c1d8 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml index 1d609a74b3..7d414c48e8 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml index ffdcce875c..abc9fec8e2 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml @@ -1,8 +1,9 @@ -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'} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml index 47ad5a137f..46ee50bf94 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml index a998a711a6..404abc929e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml index 320b45e5fa..250ded9d96 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml index 19c65bbece..0c13e298a7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml index 9c727e9965..d633f9e9b6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml index a233b2f19c..ebf68e8b5a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml index d63e26d638..cd90a175e0 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml @@ -1,8 +1,9 @@ -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: [] 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..3ba4e8136a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml index 15380073b2..c91868c800 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml index 0ef8a1fbd1..7e2cef2247 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml index 9a1f0498bf..e5842d9a56 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml index a56254c272..d4d77a0c28 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml index b7698c5e8e..36dfbcc8f6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml index 22b10a41c4..26946ae28e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml index 355b89bc00..e08bee8202 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml index 16d5a0c564..28d35b47ba 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml index eb4a3d844c..e69177b5f4 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml index c6571b02c4..c59fb8a8c8 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml index c74a1a771d..504a8bf6a3 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml index a46abc0032..89c47587b6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml index f87773007e..75f5654640 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml index 45e8a2e0a4..f1dc340928 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml index 45ab4879e3..d19217cf41 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml index f52b3a60b2..634355550a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml index 6467f897ef..8f482f4eac 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml index 5d756fa046..b79d836291 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml index 9c75339448..58eb860d9e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml index e6d9c12c81..15576b759d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml index bf5c50b962..0aef97946e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml index 7f9351d9f0..2404699d1e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml index 331d8b1215..05a305b187 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml index 05cda11720..e8f4742074 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml index e16853bb68..44e7028551 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml index 3e8a7fbf18..c4fb94b8cb 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml index cb85325a55..4669e25c8b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml index cd0bce82b3..1c5d80e22e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml index 83251f6f08..4e00097e1a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml index c4cba3be08..68438ab037 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml index 7d3df6b01b..64c194ee29 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml index e60eb49254..0a904efaca 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml index 012288685f..a9342c1d9d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml index be3454bcee..405c666d05 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml index 000e08fd71..cc5f03bcfc 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml index 6ff89ae3b7..242e581335 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml index 270b03da0e..b8ccab813a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml index 9ba60988d6..ffd098a38d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml index a3574eca22..6d8ab7e010 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml index 24e5647fd3..62e6f9fdff 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml index 28682c73f5..5f9437c5a6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml index 90e56db0b8..7334202016 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml index dded2f9a30..f2a4d836d2 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml index 9ca87b1e69..1ae61434a4 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml index a3a9da467d..03ff0fa679 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml index a5c791847d..69658cb661 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml index dbb3b49dbb..6e97bc8d7b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml index 4a434ba9bf..b6ba21f01e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml index 7d339a0ee1..7ed2f79d2b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml index 21ea684c3e..d2016e1bf5 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml @@ -1,8 +1,9 @@ -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: '{'} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml index be8c0fae68..a7bda0cc95 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml @@ -1,8 +1,9 @@ -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: ','} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml index dc7a603860..486109c8dc 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml @@ -1,8 +1,9 @@ -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'} diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml index bd5cb3103f..38d71316eb 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml index 280ec65464..c1baef0f6c 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml index 2dbe0b67b2..c5061edaf3 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml index 6cb4dcf700..f92c98da73 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml index 8dec321bb7..fe8ead9bf7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml index ea99574ad6..3ce55bf46b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml index 2c99a8e1b6..152841e7f0 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml index a0f28d08c6..12d260ee0b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml index e5b941baf7..7a323b8be1 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml index 669e8ba928..33f274d0a0 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml index 0f4f4fc107..ef55e984dd 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml index 7b513e8d13..08e9aa95fd 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml index f17727fecc..1be2e81ee0 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml index 9f2442d45e..0ca7a9545b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml index 4f6c9a71cb..51f7f2c226 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml index 37f6972b2b..b46d9d424b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml @@ -1,8 +1,9 @@ -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: [] 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..eef6f9bfd4 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml index 88a2949955..bc5ff3c8ef 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml b/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml index 2a53660ba1..22ee5cf3a1 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml b/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml index d727c473f2..e6447e49cc 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/marks/takeDownOne.yml b/src/test/suite/fixtures/recorded/marks/takeDownOne.yml index 57e1860d44..999686f24e 100644 --- a/src/test/suite/fixtures/recorded/marks/takeDownOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeDownOne.yml @@ -1,8 +1,9 @@ -spokenForm: take down one languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take down one + action: setSelection + targets: - type: primitive selectionType: line mark: diff --git a/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml b/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml index da363afe6c..2bd26eb0ca 100644 --- a/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml +++ b/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml @@ -1,8 +1,9 @@ -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: diff --git a/src/test/suite/fixtures/recorded/marks/takeRowFive.yml b/src/test/suite/fixtures/recorded/marks/takeRowFive.yml index 8de57dc56e..811a5e4897 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowFive.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowFive.yml @@ -1,8 +1,9 @@ -spokenForm: take row five languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row five + action: setSelection + targets: - type: primitive selectionType: line mark: diff --git a/src/test/suite/fixtures/recorded/marks/takeRowFour.yml b/src/test/suite/fixtures/recorded/marks/takeRowFour.yml index 91b6504147..9481e8621e 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowFour.yml @@ -1,8 +1,9 @@ -spokenForm: take row four languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row four + action: setSelection + targets: - type: primitive selectionType: line mark: diff --git a/src/test/suite/fixtures/recorded/marks/takeRowOne.yml b/src/test/suite/fixtures/recorded/marks/takeRowOne.yml index 29b747cb0f..22aab37794 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowOne.yml @@ -1,8 +1,9 @@ -spokenForm: take row one languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take row one + action: setSelection + targets: - type: primitive selectionType: line mark: diff --git a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml index 134bc7216d..572697a16a 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml @@ -1,8 +1,9 @@ -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: diff --git a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml index 4c10227393..212746f234 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml @@ -1,8 +1,9 @@ -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: diff --git a/src/test/suite/fixtures/recorded/marks/takeSource.yml b/src/test/suite/fixtures/recorded/marks/takeSource.yml index da79a0e73e..1014db7a40 100644 --- a/src/test/suite/fixtures/recorded/marks/takeSource.yml +++ b/src/test/suite/fixtures/recorded/marks/takeSource.yml @@ -1,8 +1,9 @@ -spokenForm: take source languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take source + action: setSelection + targets: - type: primitive mark: {type: source} extraArgs: [] diff --git a/src/test/suite/fixtures/recorded/marks/takeThat.yml b/src/test/suite/fixtures/recorded/marks/takeThat.yml index be69ef3490..58f216b682 100644 --- a/src/test/suite/fixtures/recorded/marks/takeThat.yml +++ b/src/test/suite/fixtures/recorded/marks/takeThat.yml @@ -1,8 +1,9 @@ -spokenForm: take that languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take that + action: setSelection + targets: - type: primitive mark: {type: that} extraArgs: [] diff --git a/src/test/suite/fixtures/recorded/marks/takeThis.yml b/src/test/suite/fixtures/recorded/marks/takeThis.yml index e88be39a35..dc21d2390a 100644 --- a/src/test/suite/fixtures/recorded/marks/takeThis.yml +++ b/src/test/suite/fixtures/recorded/marks/takeThis.yml @@ -1,8 +1,9 @@ -spokenForm: take this languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take this + action: setSelection + targets: - type: primitive mark: {type: cursor} extraArgs: [] diff --git a/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml b/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml index 1b1598cf2b..77c64f6e20 100644 --- a/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml @@ -1,8 +1,9 @@ -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: diff --git a/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml b/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml index 69b0e7e2e5..69e12b09b5 100644 --- a/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml @@ -1,8 +1,9 @@ -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: diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml index 569f02aaf2..8dc7cadd12 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml index ccb2f3663c..2477134ac1 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml index 4ce303c055..dcee2af6dd 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml index c6273f1c56..2a16e69826 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml b/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml index 341acfe964..48bd029ffc 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckAir.yml b/src/test/suite/fixtures/recorded/positions/chuckAir.yml index 71a4cef605..539caa6949 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAir.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml index dbf0bc6b00..eb26bcc412 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml index 87ed81105d..4d049d015a 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml index 6504154bc5..1b6a501eda 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml index bc5aa41642..bad4309d55 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml index 7d10159f52..ba8e05ff42 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml b/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml index d653d834ef..4136b7e967 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml b/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml index d41789ce95..fb85322269 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: diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml b/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml index bf7c0c56d5..93d8528f50 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: diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml index f19ef724ba..7789e426ef 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml index 2501b4b2e1..4f74c0d8cc 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: diff --git a/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml b/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml index 9fd0e174a7..5f26892a16 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: 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..c9c8a8d8ce 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml index 934f7f97f8..7ac33e6d01 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml index 47a9385e1a..626ec852f8 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml index 23009406d4..4ca7bd6ce3 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml index 42533e9c52..ec89741d8c 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml index 2459c621ee..4f4a047218 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml index dd5680b95e..6fd7dac6fe 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml index e44b5a6334..a41768d859 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml index 84be045565..895c4ef1c5 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml @@ -1,8 +1,9 @@ -spokenForm: chuck file languageId: typescript command: - actionName: remove - partialTargets: + version: 1 + spokenForm: chuck file + action: remove + targets: - {type: primitive, selectionType: document} extraArgs: [] initialState: diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml index bc1e7c1126..712167ba72 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml index 077e64f49a..603697f483 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml index a8a56d151f..343ae3f59b 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml b/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml index f0233f59b8..c037ba3e48 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml @@ -1,8 +1,9 @@ -spokenForm: drink cell languageId: python command: - actionName: editNewLineBefore - partialTargets: + version: 1 + spokenForm: drink cell + action: editNewLineBefore + targets: - {type: primitive, selectionType: notebookCell} extraArgs: [] initialState: diff --git a/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml index b282b8a888..46e91d2ca1 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml index 8f4593f8a3..88296646c1 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml b/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml index 2282aa5fbf..54c9f7a484 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml @@ -1,8 +1,9 @@ -spokenForm: pour cell languageId: python command: - actionName: editNewLineAfter - partialTargets: + version: 1 + spokenForm: pour cell + action: editNewLineAfter + targets: - {type: primitive, selectionType: notebookCell} extraArgs: [] initialState: diff --git a/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml index 6817199e8a..3ed998e113 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml index d0c2446b21..a696801b08 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml index 4784d0b73d..cae3fe34b9 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml index 553bdf1fec..512268ff84 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml index 6f64c366df..c8d3318616 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: diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml index 6c21316a78..d124810d25 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 diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml index a0eb6f54e6..83d4ea60c9 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml @@ -1,8 +1,9 @@ -spokenForm: take file languageId: typescript command: - actionName: setSelection - partialTargets: + version: 1 + spokenForm: take file + action: setSelection + targets: - {type: primitive, selectionType: document} extraArgs: [] initialState: diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml index 9d3fa9fa95..74cd00d5c2 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml b/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml index 2dcfb10d4a..89008c8122 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml index 351b2e54cc..bd81b885dc 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml index 09d937f422..960c87f2e4 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml index 3386224d4e..99a6695bd9 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml index 22620b4bbe..c167028b4f 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml index a6071f49a9..c43582f239 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml index a929925fc3..57883afcf2 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml index b696500ea5..784d624653 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml index ecc050e57b..e6049a975f 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml index 4369857140..18e87df9b2 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml index 2fca87e41d..e8e5fe21fb 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml index f13e2a07c3..bcec60b81b 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml b/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml index 563cb85bf3..0845364f84 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml index 8d59884ed7..c261ef7ccf 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml index 34fd2e4d71..d9a8270175 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml index 818cf7886d..7f0aa2e943 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml index 0a6452a427..d72ff46554 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml index 45c014e7fa..6bbb5784d6 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml index 05d29e77c9..16fa65035a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml index 4bea4c413a..ae253ef407 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml index 1837da0cd0..df84f4cb31 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml index f9aa0dca15..b899884270 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml index c9814ef88b..4cbda117c3 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml b/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml index d0dfbfafdd..0079325957 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml index c929b37471..084c6f315a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml index d798d5cf9b..a4bd164239 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml index e0a98cbdb4..06ec3c7ca7 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml index 791ddc175a..2f92830bca 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml index b2f52ad662..5c7b2fcb6c 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 diff --git a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml index 7dc54f538d..3f0cb5719f 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 diff --git a/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml b/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml index aa22f6319f..7969421561 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml b/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml index 66e8dad462..8226e26464 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml index 089408675e..219b982822 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml index b9a9316b82..1ca8be428a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml index b0e735b416..ba39124228 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml index 39bbc1ae32..fde4f135a4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml index e2d930ae5f..9a1b12b841 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml index 6ab3f755f5..05a509767c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml index da0cc2d655..2390b7e714 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml index d7278f9743..64efc3f3cc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml index 1ab408d893..20008d79f1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml index f1b0e0192b..76cf4481a6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml index c82e8c3467..983f38dbe5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml index a695c3f981..4246b1c059 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml index 79944baaeb..9eff5e94b7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml index 1bb04c7a36..35f43ee61c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml index ae5df502be..978d5ef7a6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml index d09eca7c98..b2891e1998 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml index c7cdc1be00..a4ed3d3614 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml @@ -1,8 +1,9 @@ -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: [] 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..82b99eee76 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml @@ -1,8 +1,9 @@ -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: [] 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..231f59b45a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml @@ -1,8 +1,9 @@ -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: [] 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..42a648677d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml @@ -1,8 +1,9 @@ -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: [] 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..117c8b8d98 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml @@ -1,8 +1,9 @@ -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: [] 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..02ce9605ab 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml @@ -1,8 +1,9 @@ -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: [] 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..a531f09a0b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml @@ -1,8 +1,9 @@ -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: [] 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..47e02452a9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml @@ -1,8 +1,9 @@ -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: [] 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..1b69092c76 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml @@ -1,8 +1,9 @@ -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: [] 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..97d7d9d123 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml @@ -1,8 +1,9 @@ -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: [] 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..3767bc8dfa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml @@ -1,8 +1,9 @@ -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: [] 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..719e10dbcb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml @@ -1,8 +1,9 @@ -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: [] 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..040b17c2be 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml @@ -1,8 +1,9 @@ -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: [] 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..a7f5bb20dc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml @@ -1,8 +1,9 @@ -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: [] 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..ddb4d1accc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml @@ -1,8 +1,9 @@ -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: [] 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..a311afc34a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml @@ -1,8 +1,9 @@ -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: [] 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..d241bef436 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml @@ -1,8 +1,9 @@ -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: [] 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..1ed77f5f91 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml @@ -1,8 +1,9 @@ -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: [] 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..06fdaa1680 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml @@ -1,8 +1,9 @@ -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: [] 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..2a033a9a7d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml @@ -1,8 +1,9 @@ -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: [] 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..1a7bd04941 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml @@ -1,8 +1,9 @@ -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: [] 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..07757383da 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml @@ -1,8 +1,9 @@ -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: [] 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..98b9bd8e0f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml @@ -1,8 +1,9 @@ -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: [] 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..579eff765d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml @@ -1,8 +1,9 @@ -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: [] 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..7e0678e8fc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml @@ -1,8 +1,9 @@ -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: [] 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..3dbf30c2a2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml @@ -1,8 +1,9 @@ -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: [] 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..01da56091e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml @@ -1,8 +1,9 @@ -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: [] 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..01da56091e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml @@ -1,8 +1,9 @@ -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: [] 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..3c1c28780b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml @@ -1,8 +1,9 @@ -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: [] 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..7468c96c62 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml @@ -1,8 +1,9 @@ -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: [] 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..216a0e2f1a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml @@ -1,8 +1,9 @@ -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: [] 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..d00af02bf5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml @@ -1,8 +1,9 @@ -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: [] 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..9b92c49d90 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml @@ -1,8 +1,9 @@ -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: [] 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..a3bcb0904c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml @@ -1,8 +1,9 @@ -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: [] 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..85c9db085b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml @@ -1,8 +1,9 @@ -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: [] 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..c331e50a85 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml @@ -1,8 +1,9 @@ -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: [] 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..06067df267 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml @@ -1,8 +1,9 @@ -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: [] 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..b021f36b60 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml @@ -1,8 +1,9 @@ -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: [] 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..6bf4c3cd6b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml @@ -1,8 +1,9 @@ -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: [] 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..b6a8367ad6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml @@ -1,8 +1,9 @@ -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: [] 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..4d034a50ec 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml @@ -1,8 +1,9 @@ -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: [] 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..e062277071 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml @@ -1,8 +1,9 @@ -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: [] 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..b67de5c084 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml @@ -1,8 +1,9 @@ -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: [] 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..7bf2eee123 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml @@ -1,8 +1,9 @@ -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: [] 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..8f274ad26d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml @@ -1,8 +1,9 @@ -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: [] 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..aa78fe6a55 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml @@ -1,8 +1,9 @@ -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: [] 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..799d697bdd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml @@ -1,8 +1,9 @@ -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: [] 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..95f74923e4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml @@ -1,8 +1,9 @@ -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: [] 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..7a149986e5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml @@ -1,8 +1,9 @@ -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: [] 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..ee376f45e3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml @@ -1,8 +1,9 @@ -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: [] 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..217367926a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml @@ -1,8 +1,9 @@ -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: [] 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..fc3320d7ef 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml @@ -1,8 +1,9 @@ -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: [] 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..e747443537 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml @@ -1,8 +1,9 @@ -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: [] 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..0ef594fa4d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml @@ -1,8 +1,9 @@ -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: [] 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..7a50c17d5a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml @@ -1,8 +1,9 @@ -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: [] 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..7656c814a1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml @@ -1,8 +1,9 @@ -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: [] 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..f243c29ae6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml @@ -1,8 +1,9 @@ -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: [] 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..934f6c2733 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml @@ -1,8 +1,9 @@ -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: [] 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..7290ee946c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml @@ -1,8 +1,9 @@ -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: [] 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..07d39e8403 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml @@ -1,8 +1,9 @@ -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: [] 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..5c930fae0d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml @@ -1,8 +1,9 @@ -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: [] 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..4d23591949 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml @@ -1,8 +1,9 @@ -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: [] 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..9e1cb370d5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml @@ -1,8 +1,9 @@ -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: [] 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..5c034454bc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml @@ -1,8 +1,9 @@ -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: [] 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..2f495698c3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml @@ -1,8 +1,9 @@ -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: [] 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..cdad55411c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml @@ -1,8 +1,9 @@ -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: [] 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..1a3ea052e2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml @@ -1,8 +1,9 @@ -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: [] 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..7f7b8ac6ff 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml @@ -1,8 +1,9 @@ -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: [] 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..766d2de2cc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml @@ -1,8 +1,9 @@ -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: [] 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..c3237c902f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml @@ -1,8 +1,9 @@ -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: [] 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..d37ea67eba 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml @@ -1,8 +1,9 @@ -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: [] 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..0f64d38c54 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml @@ -1,8 +1,9 @@ -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: [] 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..f9769eab4f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml @@ -1,8 +1,9 @@ -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: [] 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..94cf095ddb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml @@ -1,8 +1,9 @@ -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: [] 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..214798e956 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml @@ -1,8 +1,9 @@ -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: [] 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..f6e51e7320 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml @@ -1,8 +1,9 @@ -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: [] 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..f67bd2d305 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml @@ -1,8 +1,9 @@ -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: [] 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..76f8b6e08a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml @@ -1,8 +1,9 @@ -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: [] 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..c89a62b132 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml @@ -1,8 +1,9 @@ -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: [] 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..0d58fa8153 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml @@ -1,8 +1,9 @@ -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: [] 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..5a184fbad5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml @@ -1,8 +1,9 @@ -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: [] 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..4997789955 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml @@ -1,8 +1,9 @@ -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: [] 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..ef48aef177 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml @@ -1,8 +1,9 @@ -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: [] 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..4dc13ddefb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml @@ -1,8 +1,9 @@ -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: [] 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..0dece6b84c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml @@ -1,8 +1,9 @@ -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: [] 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..323dd34f71 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml @@ -1,8 +1,9 @@ -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: [] 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..e96b6359a4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml @@ -1,8 +1,9 @@ -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: [] 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..9932f50779 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml @@ -1,8 +1,9 @@ -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: [] 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..c88bdd2a23 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml @@ -1,8 +1,9 @@ -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: [] 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..b63c37408e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml @@ -1,8 +1,9 @@ -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: [] 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..afce043c56 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml @@ -1,8 +1,9 @@ -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: [] 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..eacb5aa15a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml @@ -1,8 +1,9 @@ -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: [] 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..0cc24f73b8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml @@ -1,8 +1,9 @@ -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: [] 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..80b1ac1e6b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml @@ -1,8 +1,9 @@ -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: [] 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..dda4e83d55 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml @@ -1,8 +1,9 @@ -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: [] 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..c4240a5a71 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml @@ -1,8 +1,9 @@ -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: [] 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..56492f7e30 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml @@ -1,8 +1,9 @@ -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: [] 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..02dade3dbf 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml @@ -1,8 +1,9 @@ -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: [] 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..de92f597a7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml @@ -1,8 +1,9 @@ -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: '['} 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..35c6f15d8b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml @@ -1,8 +1,9 @@ -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: ']'} 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..6859f4a11c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml @@ -1,8 +1,9 @@ -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: [] 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..2ba01b6cc1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml @@ -1,8 +1,9 @@ -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: [] 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..c7c837e653 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml index 8b6fbd52a0..7d3a390d1f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml index 8ba6ec7857..9b84fdfa36 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml index 7574357495..5970b22b99 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml index 7eed02dc97..c6ea27caba 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml index d070d05ebf..70c482bbcd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml @@ -1,12 +1,14 @@ -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} + mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} extraArgs: [] + usePrePhraseSnapshot: true 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..e2ebd0f64f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml index c77a4076cd..13cc14895b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml @@ -1,12 +1,12 @@ -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..80f398695c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml @@ -1,12 +1,12 @@ -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..261b54b62a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml @@ -1,12 +1,12 @@ -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..1b27d8dc23 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml index af6ac8ead6..42274bdb24 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml index 61e8ca3aff..fb6f26cc55 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml index ddeef336c7..2c973ee88b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml index f370ed50b4..efb78d9d52 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml index bd672c2062..7a01b2763b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml index ecd80bb21f..813eeca46c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml index 3399f60016..ce4e73c1a1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml index 8ca3729ee1..29cad3cc46 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml index 80cc14c1a3..ca38b19e26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml @@ -1,12 +1,12 @@ -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..7f3f8788a7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml index 8fd6b6251a..9ad16505ef 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml index 07f60312a7..31cbc383c8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml index ac9fafb8ae..1b9434a2d9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml index 6cb759aba4..29c52279d0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml index f39474f703..42a4be03d7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml index 6ec70f5ac1..708411f498 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml index a8ca6926b8..7efa136408 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml @@ -1,12 +1,12 @@ -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..2c87e6a7f8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml @@ -1,12 +1,12 @@ -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..532154ee61 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml @@ -1,12 +1,12 @@ -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..9afa359832 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml @@ -1,12 +1,12 @@ -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..bbc4dba9ec 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml @@ -1,12 +1,12 @@ -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..675af9bf4f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml @@ -1,12 +1,12 @@ -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..58f64a80de 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml @@ -1,12 +1,12 @@ -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..b1c8b3b8f1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml @@ -1,16 +1,13 @@ -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..0c651ba20d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml @@ -1,16 +1,13 @@ -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..e274ad55c7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml @@ -1,16 +1,13 @@ -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..c66b5956a6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml @@ -1,12 +1,12 @@ -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..196fc3bfe4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml @@ -1,12 +1,12 @@ -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..a5ad0af21b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml @@ -1,12 +1,12 @@ -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..32e66d9de0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml @@ -1,12 +1,12 @@ -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..e5bc54c76c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml @@ -1,12 +1,12 @@ -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..7592150b03 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml @@ -1,12 +1,12 @@ -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..6f0111903d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml @@ -1,12 +1,12 @@ -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..3ed7f101d0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml @@ -1,12 +1,12 @@ -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..5ed9695880 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml @@ -1,12 +1,12 @@ -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..1dff47acd4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml @@ -1,12 +1,12 @@ -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..952a8d44c3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml @@ -1,12 +1,12 @@ -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..9f4b597e73 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml @@ -1,12 +1,12 @@ -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..348cf99537 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml @@ -1,12 +1,12 @@ -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..db50126d97 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml @@ -1,12 +1,12 @@ -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..4a0aaaed8f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml @@ -1,12 +1,12 @@ -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..8a814f0ba0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml @@ -1,12 +1,12 @@ -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..0d60205416 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml @@ -1,12 +1,12 @@ -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..7438407822 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml @@ -1,12 +1,12 @@ -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..5163f48950 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml @@ -1,12 +1,12 @@ -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..e9788b0895 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml @@ -1,12 +1,12 @@ -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..3c6aa927e2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml @@ -1,12 +1,12 @@ -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..afd0a241cd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml @@ -1,12 +1,12 @@ -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..bdf45e1c4f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml @@ -1,12 +1,12 @@ -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..2e487eb29d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml @@ -1,12 +1,12 @@ -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..4eedd75038 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml @@ -1,12 +1,12 @@ -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..7b32e3082a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml @@ -1,12 +1,12 @@ -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..77db3e8fa7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml @@ -1,12 +1,12 @@ -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..45cfcbadc6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml @@ -1,12 +1,12 @@ -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..f01169f764 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml @@ -1,12 +1,12 @@ -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..e101cb537f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml @@ -1,12 +1,12 @@ -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..c7b52cd0c6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml @@ -1,12 +1,12 @@ -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..0e319fd086 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml @@ -1,16 +1,13 @@ -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..7a33e51cee 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml @@ -1,16 +1,13 @@ -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..45948147ab 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml @@ -1,12 +1,12 @@ -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..4744544a8a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml index 04c691aba6..1659c44b67 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml index 1d345b6f3b..483c61f5d2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml index f8e6762fe4..19e70f4d76 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml index 0804a4228f..fe4976b46b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml @@ -1,12 +1,14 @@ -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} + mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} extraArgs: [] + usePrePhraseSnapshot: true 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..37bc5ef8aa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml index 8986a6b0a9..83b47dea3b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml index 5755fdc975..3ab9ab29b3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml index 87f2d40b76..9537997829 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml index 6bb3a86f03..b910c68af1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml index 5354436abf..5f10e0ea60 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml index e28c69137c..e1d76e258f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml index 0392e38ba7..4693cd2862 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml index 4636e719e6..a628d35168 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml index 5813bbbb14..4fd7b79bfa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml index 1a714dde66..05c1e7e950 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml index 3aa30498db..1b9f96c62d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml index f88e983626..d711b2ccce 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml index 81d8bd58ff..62f230d00f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml index 5735186c9f..6a4dc7e6f3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml index a0d3360909..521d259cf2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml index 3a23f8edbe..9f29e5a8e9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml index 517c75b94c..8a921052af 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml @@ -1,12 +1,12 @@ -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..7d84cbe525 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml @@ -1,12 +1,12 @@ -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..f64a4ffad8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml @@ -1,12 +1,12 @@ -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..ba2316199d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml @@ -1,12 +1,12 @@ -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..da842d9518 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml @@ -1,12 +1,12 @@ -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..50df1b6de2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml @@ -1,12 +1,12 @@ -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..ad5902afd0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml @@ -1,12 +1,12 @@ -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..6829a9be50 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml @@ -1,12 +1,12 @@ -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..e069a023f1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml index a192bfec69..4a20949a86 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml index 5578299157..f1f978a3e7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml index 06a8baedd0..10b1dd6bfc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml index 222e823bb7..f493e963d4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml index 94bbb06c06..2f597632b3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml index 6848804c9e..e4a7553369 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml index 6567947825..1e51825644 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml @@ -1,12 +1,12 @@ -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..9d02783d36 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml @@ -1,12 +1,12 @@ -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..b485cc1862 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml index aec410d0db..2d21d9b669 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml index 546e225bf4..02c74dd164 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml index 669388e290..0c5717ea15 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml index b99859377d..b7bdc97723 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml index 430c86b29a..dc96b4b8d4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml index 1103dcda8c..c0d851860b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml index 2bd5475309..6aef743c70 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml index 7426872d3a..e4dda841e1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml index 3db8b16a7d..a8e392766a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml @@ -1,12 +1,12 @@ -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..26063dc6e0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml index 5f5b5a67b4..aacab0f35e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml index 3bddc3ea3c..2db90bd79e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml index 9432ee313f..171ac9bb8d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml index 925716b6dc..584ee0aa7a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml index 3be3682390..67ddb81df4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml index 42fa3c54b7..a8de3d2353 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml index 198165e528..694a084d08 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml index f7e02528ab..2c4aaa23a5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml @@ -1,12 +1,12 @@ -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..d8717f1e09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml @@ -1,12 +1,12 @@ -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..39f061143e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml @@ -1,12 +1,12 @@ -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..1d20e156eb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml @@ -1,12 +1,12 @@ -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..fce8ed39f7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml @@ -1,12 +1,12 @@ -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..62c646648e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml @@ -1,12 +1,12 @@ -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..0377d0a64e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml @@ -1,12 +1,12 @@ -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..f0fa68132b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml @@ -1,12 +1,14 @@ -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} + mark: {type: decoratedSymbol, symbolColor: default, character: f} extraArgs: [] + usePrePhraseSnapshot: true 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..2f59655951 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml @@ -1,16 +1,13 @@ -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..3ed4255b8e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml @@ -1,16 +1,13 @@ -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..49d4097e48 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml @@ -1,12 +1,14 @@ -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} + mark: {type: decoratedSymbol, symbolColor: default, character: u} extraArgs: [] + usePrePhraseSnapshot: true 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..f8fd856440 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml @@ -1,16 +1,13 @@ -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..85560220c9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml @@ -1,12 +1,12 @@ -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..ad74f5cda8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml @@ -1,12 +1,12 @@ -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..54edb40b65 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml @@ -1,12 +1,12 @@ -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..cbbdec1e1e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml @@ -1,12 +1,12 @@ -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..2f5709c3f3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml @@ -1,12 +1,12 @@ -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..778c671ddf 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml @@ -1,12 +1,12 @@ -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..3ddc9743ed 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml @@ -1,12 +1,12 @@ -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..07e6b43e91 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml @@ -1,12 +1,12 @@ -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..defb14d37f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml index 58be265451..d103230ec4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml index 5742cff419..739a8e67ce 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml index 573f34bcae..3cb69ab543 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml index d7c70a73ba..91ad79a091 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml index 61645eb81e..3740a048a5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml index 86effc5466..b3183cb1c6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml index aad17d3f01..1617755b13 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml @@ -1,12 +1,12 @@ -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..1f43dca1bc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml @@ -1,12 +1,12 @@ -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..78091e3cc1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml @@ -1,12 +1,12 @@ -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..565c3ff25c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml @@ -1,12 +1,12 @@ -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..89ead8a200 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml @@ -1,12 +1,12 @@ -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..0179eef688 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml @@ -1,12 +1,12 @@ -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..b0e7dcaee3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml @@ -1,12 +1,12 @@ -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..6789d215c8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml @@ -1,12 +1,12 @@ -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..7cff3a3fe4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml @@ -1,12 +1,12 @@ -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..208ed886eb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml @@ -1,12 +1,12 @@ -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..658dcaa23f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml @@ -1,12 +1,12 @@ -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..6235e2d081 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml @@ -1,12 +1,12 @@ -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..a18e817c63 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml @@ -1,12 +1,12 @@ -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..b068b28b26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml @@ -1,12 +1,12 @@ -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..958fcdd497 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml @@ -1,12 +1,12 @@ -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..c2c4fd7900 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml @@ -1,12 +1,12 @@ -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..8c2c2575fc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml @@ -1,12 +1,12 @@ -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..94265382a7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml @@ -1,12 +1,12 @@ -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..18b116e5be 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml @@ -1,12 +1,12 @@ -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..ba364c2c9a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml @@ -1,12 +1,12 @@ -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..85768a16af 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml @@ -1,12 +1,12 @@ -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..44cb18774e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml @@ -1,12 +1,12 @@ -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..7afd1e1b76 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml @@ -1,12 +1,12 @@ -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..e5d3595ce6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml @@ -1,16 +1,13 @@ -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..26deb730a1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml @@ -1,16 +1,13 @@ -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..6dd5d95d62 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml @@ -1,12 +1,12 @@ -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..2effd062e3 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml index c1b4342f1b..588f52c505 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml index 4cce1eb78b..1abd6b94f7 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml index f56aec41b6..2def22d871 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml index cbabac18d4..3066f48af8 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml index bb7a1b1cc4..4ce647217c 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml index f6d5ddb242..0630902bad 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml index 16dbfa2f5e..ce80d6fb21 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml index da0ad8a41c..31468ab66b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml index c10dcc1c84..b127b04516 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml index ec1cc47183..b048bc80c7 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml index eb970c4039..736774093b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml index acfef29899..40f183ab1c 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml index d41f0ed53c..333237b012 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml index dfecfb3212..9289ff256e 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml index a1106add93..cfe2aad1cf 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml index c1ad9bb990..1dfd056939 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml index 0fc950a8fc..2cdad0f6f5 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml index ff76d437e5..e23bb56ea9 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml index 1c2abb6e72..9fa731968c 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml index bc665c8d97..d0c2dac603 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml index b3f8f33d24..0204443e67 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml index 9622ddcb53..fc7ffe9427 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml index 9622ddcb53..fc7ffe9427 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml index 2eeeab650d..1f45dc1079 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml index bc603d7395..85eae5eeed 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml index 9b15e441fe..c9a331254d 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml @@ -1,8 +1,9 @@ -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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml index c31aab8059..64d8b6b461 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml index a3c0348f0a..5d4d11ef31 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml index d206be2206..d10ead3eec 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml index a782e82d6e..ef096efea8 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml index 766f84d86d..c2623c6f4a 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml index 439c75fb52..271a463c8b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml @@ -1,8 +1,9 @@ -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} diff --git a/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml b/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml index e4d9454140..e2725a0dd2 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 diff --git a/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml b/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml index e7edc40c56..7a24406abc 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml @@ -1,8 +1,9 @@ -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: [] diff --git a/src/util/canonicalizeAndValidateCommand.ts b/src/util/canonicalizeAndValidateCommand.ts index 06218d5761..af639f63b0 100644 --- a/src/util/canonicalizeAndValidateCommand.ts +++ b/src/util/canonicalizeAndValidateCommand.ts @@ -7,6 +7,13 @@ import { CommandArgumentLatest, } 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( commandArgument: CommandArgument ): CommandArgumentLatest { From c01bd096234c4da4a4b3f2fded15d69fc45b8159 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 2 Dec 2021 20:20:49 +0000 Subject: [PATCH 42/54] Fix ci --- src/core/commandRunner/CommandRunner.ts | 2 +- src/core/commandRunner/types.ts | 5 +++++ src/util/canonicalizeAndValidateCommand.ts | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/core/commandRunner/CommandRunner.ts b/src/core/commandRunner/CommandRunner.ts index 3e44ae22f2..bc784cd3f3 100644 --- a/src/core/commandRunner/CommandRunner.ts +++ b/src/core/commandRunner/CommandRunner.ts @@ -48,7 +48,7 @@ export default class CommandRunner { action: actionName, targets: partialTargets, extraArgs, - usePrePhraseSnapshot = false, + usePrePhraseSnapshot, } = canonicalizeAndValidateCommand(commandArgument); const readableHatMap = await this.graph.hatTokenMap.getReadableMap( diff --git a/src/core/commandRunner/types.ts b/src/core/commandRunner/types.ts index 169e32be11..34c13cf1ac 100644 --- a/src/core/commandRunner/types.ts +++ b/src/core/commandRunner/types.ts @@ -1,5 +1,10 @@ import { ActionType, PartialTarget } from "../../typings/Types"; +export type CommandArgumentComplete = Required< + Omit +> & + Pick; + export type CommandArgumentLatest = CommandArgumentV1; export type CommandArgument = CommandArgumentV0 | CommandArgumentV1; diff --git a/src/util/canonicalizeAndValidateCommand.ts b/src/util/canonicalizeAndValidateCommand.ts index af639f63b0..311fb4bb17 100644 --- a/src/util/canonicalizeAndValidateCommand.ts +++ b/src/util/canonicalizeAndValidateCommand.ts @@ -4,7 +4,7 @@ import { ActionType, PartialTarget, SelectionType } from "../typings/Types"; import { getPartialPrimitiveTargets } from "./getPrimitiveTargets"; import { CommandArgument, - CommandArgumentLatest, + CommandArgumentComplete, } from "../core/commandRunner/types"; /** @@ -16,11 +16,12 @@ import { */ export function canonicalizeAndValidateCommand( commandArgument: CommandArgument -): CommandArgumentLatest { +): CommandArgumentComplete { const { action: inputActionName, targets: inputPartialTargets, extraArgs: inputExtraArgs = [], + usePrePhraseSnapshot = false, ...rest } = commandArgument; @@ -36,6 +37,7 @@ export function canonicalizeAndValidateCommand( action: actionName, targets: partialTargets, extraArgs: extraArgs, + usePrePhraseSnapshot, }; } From f609c7ce90957e46cc50766965b718cf95626150 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 2 Dec 2021 20:43:50 +0000 Subject: [PATCH 43/54] Rollback decoration test change --- src/core/Decorations.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/Decorations.ts b/src/core/Decorations.ts index 0513008e12..c2896042ee 100644 --- a/src/core/Decorations.ts +++ b/src/core/Decorations.ts @@ -20,7 +20,6 @@ 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; @@ -191,9 +190,9 @@ export default class Decorations { shapePenalties.default = 0; colorPenalties.default = 0; - const activeHatColors = isTesting() - ? HAT_COLORS - : HAT_COLORS.filter((color) => colorEnablement[color]); + const activeHatColors = HAT_COLORS.filter( + (color) => colorEnablement[color] + ); const activeNonDefaultHatShapes = HAT_NON_DEFAULT_SHAPES.filter( (shape) => shapeEnablement[shape] ); From 006681b0585636d47499f435789d8ac6e2c18a86 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Fri, 3 Dec 2021 17:05:48 +0000 Subject: [PATCH 44/54] Attempt to fix decorations --- src/test/suite/recorded.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index 369879f4f8..81d4cd38ce 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -103,14 +103,16 @@ async function runTest(file: string) { excludeFields.push("clipboard"); } - await graph.hatTokenMap.addDecorations(); - const usePrePhraseSnapshot = fixture.command.usePrePhraseSnapshot ?? false; if (usePrePhraseSnapshot) { mockPrePhraseGetVersion(graph, async () => "version"); } + // NB: We mock the pre phrase version before adding the decorations because + // snapshot will get taken at the point that we add the decorations + await graph.hatTokenMap.addDecorations(); + const readableHatMap = await graph.hatTokenMap.getReadableMap( usePrePhraseSnapshot ); From 4b13d06bec720d4e491dac1222845a03941e36db Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Thu, 2 Dec 2021 20:45:05 +0000 Subject: [PATCH 45/54] Normalize hat enablement during testing --- src/core/Decorations.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/Decorations.ts b/src/core/Decorations.ts index c2896042ee..0513008e12 100644 --- a/src/core/Decorations.ts +++ b/src/core/Decorations.ts @@ -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; @@ -190,9 +191,9 @@ export default class Decorations { shapePenalties.default = 0; colorPenalties.default = 0; - const activeHatColors = HAT_COLORS.filter( - (color) => colorEnablement[color] - ); + const activeHatColors = isTesting() + ? HAT_COLORS + : HAT_COLORS.filter((color) => colorEnablement[color]); const activeNonDefaultHatShapes = HAT_NON_DEFAULT_SHAPES.filter( (shape) => shapeEnablement[shape] ); From c90e810edb1464e4405c02e7354045c337522034 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Fri, 3 Dec 2021 17:19:59 +0000 Subject: [PATCH 46/54] Fix recorded tests --- src/scripts/transformRecordedTests.ts | 13 ++++++++++++- src/test/suite/prePhraseSnapshot.test.ts | 10 +++++----- src/test/suite/recorded.test.ts | 12 +----------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts index 2e2eb4d89a..050a1b0f2b 100644 --- a/src/scripts/transformRecordedTests.ts +++ b/src/scripts/transformRecordedTests.ts @@ -68,7 +68,18 @@ function identity(fixture: TestCaseFixture) { } function canonicalizeCommand(fixture: TestCaseFixture) { - return update(fixture, { command: canonicalizeAndValidateCommand }); + fixture.command = canonicalizeAndValidateCommand(fixture.command); + fixture.command.usePrePhraseSnapshot = undefined; + + const extraArgs = fixture.command.extraArgs; + fixture.command.extraArgs = + extraArgs == null + ? undefined + : extraArgs.length === 0 + ? undefined + : extraArgs; + + return fixture; } function reorderFields(fixture: TestCaseFixture) { diff --git a/src/test/suite/prePhraseSnapshot.test.ts b/src/test/suite/prePhraseSnapshot.test.ts index 2640303eb5..31a58d7c44 100644 --- a/src/test/suite/prePhraseSnapshot.test.ts +++ b/src/test/suite/prePhraseSnapshot.test.ts @@ -46,12 +46,12 @@ async function runTest( editor.selections = [new vscode.Selection(0, 0, 0, 0)]; - await graph.hatTokenMap.addDecorations(); - - let prePhraseVersion = "version"; - + let prePhraseVersion = "version1"; mockPrePhraseGetVersion(graph, async () => prePhraseVersion); + await graph.hatTokenMap.addDecorations(); + prePhraseVersion = "version2"; + await vscode.commands.executeCommand("cursorless.command", { version: 1, spokenForm: "whatever", @@ -70,7 +70,7 @@ async function runTest( if (multiplePhrases) { // If test is simulating separate phrases, we simulate pre-phrase signal being sent - prePhraseVersion = "version2"; + prePhraseVersion = "version3"; } await vscode.commands.executeCommand("cursorless.command", { diff --git a/src/test/suite/recorded.test.ts b/src/test/suite/recorded.test.ts index 81d4cd38ce..d9e07ade7b 100644 --- a/src/test/suite/recorded.test.ts +++ b/src/test/suite/recorded.test.ts @@ -103,19 +103,9 @@ async function runTest(file: string) { excludeFields.push("clipboard"); } - const usePrePhraseSnapshot = fixture.command.usePrePhraseSnapshot ?? false; - - if (usePrePhraseSnapshot) { - mockPrePhraseGetVersion(graph, async () => "version"); - } - - // NB: We mock the pre phrase version before adding the decorations because - // snapshot will get taken at the point that we add the decorations await graph.hatTokenMap.addDecorations(); - const readableHatMap = await graph.hatTokenMap.getReadableMap( - usePrePhraseSnapshot - ); + const readableHatMap = await graph.hatTokenMap.getReadableMap(false); // Assert that recorded decorations are present checkMarks(fixture.initialState.marks, readableHatMap); From 66c81954a4671a2fb330fe77bb2ffc2cc61dca07 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Fri, 3 Dec 2021 17:22:53 +0000 Subject: [PATCH 47/54] Fix tests --- .../suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml | 1 - .../recorded/actions/bringAirAndBatAndCapToAfterDrum.yml | 1 - .../recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml | 1 - .../recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml | 1 - .../recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml | 1 - .../recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml | 1 - .../recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml | 1 - src/test/suite/fixtures/recorded/actions/bringVest.yml | 1 - src/test/suite/fixtures/recorded/actions/bringVestToCap.yml | 1 - src/test/suite/fixtures/recorded/actions/callFine.yml | 1 - src/test/suite/fixtures/recorded/actions/callVest.yml | 1 - src/test/suite/fixtures/recorded/actions/callVestOnCap.yml | 1 - src/test/suite/fixtures/recorded/actions/carveVest.yml | 1 - src/test/suite/fixtures/recorded/actions/chuckVest.yml | 1 - src/test/suite/fixtures/recorded/actions/clearVest.yml | 1 - src/test/suite/fixtures/recorded/actions/commentVest.yml | 1 - src/test/suite/fixtures/recorded/actions/copyVest.yml | 1 - src/test/suite/fixtures/recorded/actions/dedentVest.yml | 1 - src/test/suite/fixtures/recorded/actions/drinkVest.yml | 1 - src/test/suite/fixtures/recorded/actions/dropVest.yml | 1 - src/test/suite/fixtures/recorded/actions/dupeUpVest.yml | 1 - src/test/suite/fixtures/recorded/actions/dupeVest.yml | 1 - src/test/suite/fixtures/recorded/actions/floatVest.yml | 1 - src/test/suite/fixtures/recorded/actions/giveAfterDot.yml | 1 - src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml | 1 - src/test/suite/fixtures/recorded/actions/giveBat.yml | 1 - src/test/suite/fixtures/recorded/actions/giveBat2.yml | 1 - src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml | 1 - src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml | 1 - .../suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml | 1 - src/test/suite/fixtures/recorded/actions/giveCap.yml | 1 - src/test/suite/fixtures/recorded/actions/giveDot.yml | 1 - src/test/suite/fixtures/recorded/actions/giveDot2.yml | 1 - src/test/suite/fixtures/recorded/actions/giveDrum.yml | 1 - .../suite/fixtures/recorded/actions/giveEqualsPastColon.yml | 1 - src/test/suite/fixtures/recorded/actions/giveHarp.yml | 1 - src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml | 1 - src/test/suite/fixtures/recorded/actions/giveQuote.yml | 1 - src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml | 1 - src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml | 1 - src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml | 1 - src/test/suite/fixtures/recorded/actions/indentVest.yml | 1 - src/test/suite/fixtures/recorded/actions/moveVest.yml | 1 - src/test/suite/fixtures/recorded/actions/moveVestToCap.yml | 1 - src/test/suite/fixtures/recorded/actions/pasteCap.yml | 1 - src/test/suite/fixtures/recorded/actions/postVest.yml | 1 - src/test/suite/fixtures/recorded/actions/pourVest.yml | 1 - src/test/suite/fixtures/recorded/actions/preeVest.yml | 1 - src/test/suite/fixtures/recorded/actions/puffVest.yml | 1 - .../suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml | 1 - .../suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml | 1 - src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml | 1 - src/test/suite/fixtures/recorded/actions/swapWithVest.yml | 1 - src/test/suite/fixtures/recorded/actions/takeVest.yml | 1 - .../fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml | 1 - .../suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml | 1 - .../fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml | 1 - .../suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml | 1 - .../fixtures/recorded/compoundTargets/takeLineVestAndAir.yml | 1 - .../fixtures/recorded/compoundTargets/takePastEndOfToken.yml | 1 - .../fixtures/recorded/compoundTargets/takePastStartOfToken.yml | 1 - .../suite/fixtures/recorded/compoundTargets/takePastTrap.yml | 1 - .../fixtures/recorded/compoundTargets/takeTokenPastTrap.yml | 1 - .../fixtures/recorded/compoundTargets/takeVestTweenWhale.yml | 1 - .../fixtures/recorded/compoundTargets/takeVestUntilWhale.yml | 1 - .../fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml | 1 - .../fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml | 1 - .../recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml | 1 - .../recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml | 1 - .../recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml | 1 - .../recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml | 1 - .../bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml | 1 - .../bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml | 1 - .../recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml | 1 - .../suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml | 1 - .../recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml | 1 - .../recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml | 1 - .../recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml | 1 - .../hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml | 1 - ...gPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml | 1 - .../hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml | 1 - .../bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml | 1 - ...ntAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml | 1 - .../bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml | 1 - ...PointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml | 1 - ...tAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml | 1 - .../recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml | 1 - .../recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml | 1 - .../recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml | 1 - .../recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml | 1 - .../hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml | 1 - .../fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml | 1 - .../recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml | 1 - .../hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml | 1 - .../chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml | 1 - ...moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml | 1 - src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml | 2 -- src/test/suite/fixtures/recorded/headTail/takeHead.yml | 1 - src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml | 1 - src/test/suite/fixtures/recorded/headTail/takeTail.yml | 1 - src/test/suite/fixtures/recorded/headTail/takeTailVest.yml | 1 - .../recorded/inference/bringLineBatPastEndOfFunkToThis.yml | 1 - .../suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml | 1 - .../fixtures/recorded/inference/bringMapAirToTokenHarp.yml | 1 - src/test/suite/fixtures/recorded/inference/bringOddToLine.yml | 1 - src/test/suite/fixtures/recorded/inference/bringOddToState.yml | 1 - src/test/suite/fixtures/recorded/inference/bringOddToToken.yml | 1 - .../fixtures/recorded/inference/bringTokenHarpToMapAir.yml | 1 - .../suite/fixtures/recorded/inference/takeAfterVestPastAir.yml | 1 - .../fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml | 1 - .../suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml | 1 - .../fixtures/recorded/inference/takeEachPastStartOfLine.yml | 1 - src/test/suite/fixtures/recorded/inference/takeFirstWord.yml | 1 - .../suite/fixtures/recorded/inference/takeHarpAndStringEach.yml | 1 - .../fixtures/recorded/inference/takeHarpPastStringEach.yml | 1 - src/test/suite/fixtures/recorded/inference/takeLastChar.yml | 1 - src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml | 1 - .../suite/fixtures/recorded/inference/takeLineVestAndAir.yml | 1 - .../suite/fixtures/recorded/inference/takeLineVestPastAir.yml | 1 - .../suite/fixtures/recorded/inference/takeOddPastEndOfState.yml | 1 - src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml | 1 - src/test/suite/fixtures/recorded/inference/takeOddPastState.yml | 1 - src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml | 1 - src/test/suite/fixtures/recorded/inference/takePastLineAir.yml | 1 - .../suite/fixtures/recorded/inference/takeStringHarpAndEach.yml | 1 - .../fixtures/recorded/inference/takeStringHarpPastEach.yml | 1 - .../suite/fixtures/recorded/inference/takeVestAndLineAir.yml | 1 - .../suite/fixtures/recorded/inference/takeVestPastAfterAir.yml | 1 - .../suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml | 1 - .../suite/fixtures/recorded/inference/takeVestPastLineAir.yml | 1 - src/test/suite/fixtures/recorded/languages/c/clearFunk.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml | 1 - .../suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml | 1 - .../suite/fixtures/recorded/languages/cpp/takeAttribute.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml | 1 - .../suite/fixtures/recorded/languages/cpp/takeClassName.yml | 1 - .../suite/fixtures/recorded/languages/cpp/takeClassName2.yml | 1 - .../suite/fixtures/recorded/languages/cpp/takeClassName3.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml | 1 - .../suite/fixtures/recorded/languages/cpp/takeEveryItem.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml | 1 - .../suite/fixtures/recorded/languages/cpp/takeFunkName2.yml | 1 - .../suite/fixtures/recorded/languages/cpp/takeFunkName3.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeList.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeName.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeState.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeString.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeType.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml | 1 - src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml | 1 - .../suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml | 1 - .../suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml | 1 - .../suite/fixtures/recorded/languages/java/chuckTypeNear.yml | 1 - .../suite/fixtures/recorded/languages/java/chuckTypeUrge.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeArg.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeArg2.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeCall.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeClass.yml | 1 - .../suite/fixtures/recorded/languages/java/takeClassName.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeComment.yml | 1 - .../suite/fixtures/recorded/languages/java/takeCondition.yml | 1 - .../suite/fixtures/recorded/languages/java/takeCondition2.yml | 1 - .../suite/fixtures/recorded/languages/java/takeCondition3.yml | 1 - .../suite/fixtures/recorded/languages/java/takeEveryArg.yml | 1 - .../suite/fixtures/recorded/languages/java/takeEveryArg2.yml | 1 - .../suite/fixtures/recorded/languages/java/takeEveryItem.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeFunk.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml | 1 - .../suite/fixtures/recorded/languages/java/takeFunkName.yml | 1 - .../suite/fixtures/recorded/languages/java/takeFunkName2.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeIf.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeItem.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeList.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeMap.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeName.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeName2.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeName3.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeState.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeString.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeType.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeType2.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeType3.yml | 1 - src/test/suite/fixtures/recorded/languages/java/takeValue.yml | 1 - src/test/suite/fixtures/recorded/languages/json/takeItem.yml | 1 - src/test/suite/fixtures/recorded/languages/json/takeItem2.yml | 1 - src/test/suite/fixtures/recorded/languages/json/takeKey.yml | 1 - src/test/suite/fixtures/recorded/languages/json/takeList.yml | 1 - src/test/suite/fixtures/recorded/languages/json/takeString.yml | 1 - src/test/suite/fixtures/recorded/languages/json/takeValue.yml | 1 - .../suite/fixtures/recorded/languages/jsx/takeAttribute.yml | 1 - src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml | 1 - src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml | 1 - .../fixtures/recorded/languages/jsx/takeEveryAttribute.yml | 1 - src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml | 1 - src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml | 1 - src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml | 1 - src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml | 1 - src/test/suite/fixtures/recorded/languages/python/chuckKey.yml | 1 - src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml | 1 - src/test/suite/fixtures/recorded/languages/python/chuckType.yml | 1 - .../suite/fixtures/recorded/languages/python/chuckTypeSoon.yml | 1 - .../suite/fixtures/recorded/languages/python/chuckTypeTrap.yml | 1 - .../suite/fixtures/recorded/languages/python/chuckValue.yml | 1 - .../suite/fixtures/recorded/languages/python/chuckValue2.yml | 1 - .../fixtures/recorded/languages/python/clearEveryValue.yml | 1 - .../suite/fixtures/recorded/languages/python/clearValue.yml | 1 - .../suite/fixtures/recorded/languages/python/clearValue2.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeArg.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeArg2.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeCall.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeClass.yml | 1 - .../suite/fixtures/recorded/languages/python/takeClass2.yml | 1 - .../suite/fixtures/recorded/languages/python/takeClassName.yml | 1 - .../suite/fixtures/recorded/languages/python/takeComment.yml | 1 - .../suite/fixtures/recorded/languages/python/takeCondition.yml | 1 - .../suite/fixtures/recorded/languages/python/takeCondition2.yml | 1 - .../suite/fixtures/recorded/languages/python/takeEveryArg.yml | 1 - .../suite/fixtures/recorded/languages/python/takeEveryArg2.yml | 1 - .../suite/fixtures/recorded/languages/python/takeEveryItem.yml | 1 - .../suite/fixtures/recorded/languages/python/takeEveryItem2.yml | 1 - .../suite/fixtures/recorded/languages/python/takeEveryItem3.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeFunk.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml | 1 - .../suite/fixtures/recorded/languages/python/takeFunkName.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeIf.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeItem.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeItem2.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeItem3.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeKey.yml | 1 - .../suite/fixtures/recorded/languages/python/takeLambda.yml | 1 - .../suite/fixtures/recorded/languages/python/takeLambdaMade.yml | 1 - .../suite/fixtures/recorded/languages/python/takeLambdaPit.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeList.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeList2.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeMap.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeName.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeName2.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeName3.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeState.yml | 1 - .../suite/fixtures/recorded/languages/python/takeString.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeType.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeType2.yml | 1 - src/test/suite/fixtures/recorded/languages/python/takeValue.yml | 1 - .../suite/fixtures/recorded/languages/python/takeValue2.yml | 1 - .../suite/fixtures/recorded/languages/python/takeValueZero.yml | 1 - .../suite/fixtures/recorded/languages/typescript/chuckKey.yml | 1 - .../fixtures/recorded/languages/typescript/chuckTypeRam.yml | 1 - .../fixtures/recorded/languages/typescript/chuckTypeSoon.yml | 1 - .../fixtures/recorded/languages/typescript/chuckTypeSoon2.yml | 1 - .../fixtures/recorded/languages/typescript/chuckTypeTrap.yml | 1 - .../fixtures/recorded/languages/typescript/chuckTypeYank.yml | 1 - .../suite/fixtures/recorded/languages/typescript/clearFunk.yml | 1 - .../suite/fixtures/recorded/languages/typescript/clearFunk2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/clearKey.yml | 1 - .../fixtures/recorded/languages/typescript/clearLambda.yml | 1 - .../fixtures/recorded/languages/typescript/clearLambda2.yml | 1 - .../fixtures/recorded/languages/typescript/clearLambda3.yml | 1 - .../fixtures/recorded/languages/typescript/clearLambda4.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeArg.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeArg2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeArrow.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeCall.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeClass.yml | 1 - .../fixtures/recorded/languages/typescript/takeClassName.yml | 1 - .../fixtures/recorded/languages/typescript/takeComment.yml | 1 - .../fixtures/recorded/languages/typescript/takeCondition.yml | 1 - .../fixtures/recorded/languages/typescript/takeCondition2.yml | 1 - .../fixtures/recorded/languages/typescript/takeCondition3.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryArgAir.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryArgBat.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryArgRam.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryItem.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryItem2.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryItem3.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryItem4.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryItem5.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryKey.yml | 1 - .../fixtures/recorded/languages/typescript/takeEveryValue.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk10.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk11.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk12.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk13.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk3.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk4.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk5.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk6.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk7.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk8.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeFunk9.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName10.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName11.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName2.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName3.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName4.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName5.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName6.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName7.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName8.yml | 1 - .../fixtures/recorded/languages/typescript/takeFunkName9.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeIf.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeItem.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeItem2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeItem3.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeItem4.yml | 1 - .../fixtures/recorded/languages/typescript/takeItemAir.yml | 1 - .../fixtures/recorded/languages/typescript/takeItemBrace.yml | 1 - .../fixtures/recorded/languages/typescript/takeItemComma.yml | 1 - .../fixtures/recorded/languages/typescript/takeItemOne.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeKey.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeList.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeList2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeMap.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeMap2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeName.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeName2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeRegex.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeState.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeString.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeType.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeType2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeValue.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeValue2.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeValue3.yml | 1 - .../suite/fixtures/recorded/languages/typescript/takeValue4.yml | 1 - src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml | 1 - src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml | 1 - src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml | 1 - src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml | 1 - src/test/suite/fixtures/recorded/marks/takeDownOne.yml | 1 - src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml | 1 - src/test/suite/fixtures/recorded/marks/takeRowFive.yml | 1 - src/test/suite/fixtures/recorded/marks/takeRowFour.yml | 1 - src/test/suite/fixtures/recorded/marks/takeRowOne.yml | 1 - .../suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml | 1 - src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml | 1 - src/test/suite/fixtures/recorded/marks/takeSource.yml | 1 - src/test/suite/fixtures/recorded/marks/takeThat.yml | 1 - src/test/suite/fixtures/recorded/marks/takeThis.yml | 1 - src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml | 1 - src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml | 1 - .../suite/fixtures/recorded/positions/chuckAfterBlockVest.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml | 1 - .../suite/fixtures/recorded/positions/chuckAfterLineVest.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckAir.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml | 1 - .../suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml | 1 - .../suite/fixtures/recorded/positions/chuckBeforeLineAir.yml | 1 - src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml | 1 - .../suite/fixtures/recorded/positions/chuckPastAfterLook.yml | 1 - .../suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml | 1 - .../suite/fixtures/recorded/positions/chuckPastEndOfLine.yml | 1 - .../suite/fixtures/recorded/positions/chuckPastEndOfLook.yml | 1 - .../suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml | 1 - .../selectionTypes/bringAirToAfterColumnBatPastFine.yml | 1 - .../selectionTypes/bringAirToBeforeColumnBatPastFine.yml | 1 - .../recorded/selectionTypes/bringAirToColumnBatPastFine.yml | 1 - .../selectionTypes/bringAirToEndOfColumnBatPastFine.yml | 1 - .../selectionTypes/bringAirToStartOfColumnBatPastFine.yml | 1 - .../suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml | 1 - .../suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml | 1 - .../suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml | 1 - src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml | 1 - .../suite/fixtures/recorded/selectionTypes/chuckLineVest.yml | 1 - .../suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml | 1 - .../suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml | 1 - src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml | 1 - .../suite/fixtures/recorded/selectionTypes/drinkCellEach.yml | 1 - .../recorded/selectionTypes/postColumnWhaleUntilEach.yml | 1 - src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml | 1 - .../suite/fixtures/recorded/selectionTypes/pourCellEach.yml | 1 - .../suite/fixtures/recorded/selectionTypes/takeBlockAir.yml | 1 - .../fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml | 1 - .../fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml | 1 - .../fixtures/recorded/selectionTypes/takeColumnUntilEach.yml | 1 - .../recorded/selectionTypes/takeColumnWhaleBetweenRam.yml | 1 - src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml | 1 - .../suite/fixtures/recorded/selectionTypes/takeLineVest.yml | 1 - .../suite/fixtures/recorded/selectionTypes/takeTokenVest.yml | 1 - .../suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml | 1 - .../suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml | 1 - src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml | 1 - src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml | 1 - .../suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml | 1 - .../suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml | 1 - .../suite/fixtures/recorded/subtoken/clearFirstCharVest.yml | 1 - .../suite/fixtures/recorded/subtoken/clearFirstWordVest.yml | 1 - src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml | 1 - src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml | 1 - .../suite/fixtures/recorded/subtoken/clearSecondWordVest.yml | 1 - .../suite/fixtures/recorded/subtoken/clearSixthCharVest.yml | 1 - src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml | 1 - src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml | 1 - src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml | 1 - src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml | 1 - src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml | 1 - .../fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml | 1 - .../fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml | 1 - .../fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml | 1 - .../suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml | 1 - .../suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml | 1 - src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml | 1 - .../fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml | 1 - .../fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml | 1 - .../suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml | 1 - .../suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml | 1 - .../recorded/subtoken/takeSecondCharLookPastEndOfToken.yml | 1 - .../recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml | 1 - src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml | 1 - .../fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair10.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair11.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair12.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair13.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair14.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair15.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair16.yml | 1 - .../fixtures/recorded/surroundingPair/html/clearPair17.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair2.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair3.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair4.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair5.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair6.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair7.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair8.yml | 1 - .../suite/fixtures/recorded/surroundingPair/html/clearPair9.yml | 1 - .../recorded/surroundingPair/parseTree/cpp/clearOutside.yml | 1 - .../recorded/surroundingPair/parseTree/cpp/clearRound8.yml | 1 - .../recorded/surroundingPair/parseTree/java/clearQuad3.yml | 1 - .../recorded/surroundingPair/parseTree/java/clearRound10.yml | 1 - .../recorded/surroundingPair/parseTree/java/clearRound11.yml | 1 - .../recorded/surroundingPair/parseTree/python/chuckMatching.yml | 1 - .../surroundingPair/parseTree/python/chuckMatching2.yml | 1 - .../surroundingPair/parseTree/python/chuckMatching3.yml | 1 - .../recorded/surroundingPair/parseTree/python/chuckPair.yml | 1 - .../recorded/surroundingPair/parseTree/python/chuckRound.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearCurly.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearCurly3.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearMatching.yml | 1 - .../surroundingPair/parseTree/python/clearMatching10.yml | 1 - .../surroundingPair/parseTree/python/clearMatching11.yml | 1 - .../surroundingPair/parseTree/python/clearMatching2.yml | 1 - .../surroundingPair/parseTree/python/clearMatching3.yml | 1 - .../surroundingPair/parseTree/python/clearMatching4.yml | 1 - .../surroundingPair/parseTree/python/clearMatching5.yml | 1 - .../surroundingPair/parseTree/python/clearMatching6.yml | 1 - .../surroundingPair/parseTree/python/clearMatching7.yml | 1 - .../surroundingPair/parseTree/python/clearMatching8.yml | 1 - .../surroundingPair/parseTree/python/clearMatching9.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearOutside7.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearOutside8.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearPair.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearPair2.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearPair3.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearPair4.yml | 1 - .../surroundingPair/parseTree/python/clearPairCurly.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearQuad2.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearQuad4.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearRound.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearRound5.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearRound6.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearRound7.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearSquare.yml | 1 - .../recorded/surroundingPair/parseTree/python/clearSquare2.yml | 1 - .../surroundingPair/parseTree/shellscript/clearCurly4.yml | 1 - .../surroundingPair/parseTree/shellscript/clearOutside23.yml | 1 - .../surroundingPair/parseTree/shellscript/clearPair.yml | 1 - .../surroundingPair/parseTree/shellscript/clearString5.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair10.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair11.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair12.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair13.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair14.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair15.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair16.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair17.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair18.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair19.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair20.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair21.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair23.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair4.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair5.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair6.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair7.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair8.yml | 1 - .../recorded/surroundingPair/parseTree/tsx/clearPair9.yml | 1 - .../surroundingPair/parseTree/typescript/clearMatching14.yml | 1 - .../surroundingPair/parseTree/typescript/clearMatching15.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside10.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside11.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside12.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside13.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside14.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside15.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside16.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside17.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside18.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside19.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside2.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside20.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside21.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside22.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside3.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside4.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside5.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside6.yml | 1 - .../surroundingPair/parseTree/typescript/clearOutside9.yml | 1 - .../recorded/surroundingPair/parseTree/typescript/clearPair.yml | 1 - .../surroundingPair/parseTree/typescript/clearPair2.yml | 1 - .../surroundingPair/parseTree/typescript/clearPair3.yml | 1 - .../surroundingPair/parseTree/typescript/clearPair4.yml | 1 - .../surroundingPair/parseTree/typescript/clearPair5.yml | 1 - .../surroundingPair/parseTree/typescript/clearPair6.yml | 1 - .../surroundingPair/parseTree/typescript/clearPair7.yml | 1 - .../recorded/surroundingPair/parseTree/typescript/clearQuad.yml | 1 - .../surroundingPair/parseTree/typescript/clearRound2.yml | 1 - .../surroundingPair/parseTree/typescript/clearRound3.yml | 1 - .../surroundingPair/parseTree/typescript/clearRound4.yml | 1 - .../recorded/surroundingPair/parseTree/typescript/clearSkis.yml | 1 - .../surroundingPair/parseTree/typescript/clearSquare3.yml | 1 - .../surroundingPair/parseTree/typescript/clearSquare4.yml | 1 - .../surroundingPair/parseTree/typescript/clearSquare5.yml | 1 - .../surroundingPair/parseTree/typescript/clearSquareLack.yml | 1 - .../surroundingPair/parseTree/typescript/clearSquareRack.yml | 1 - .../surroundingPair/parseTree/typescript/clearString.yml | 1 - .../surroundingPair/parseTree/typescript/clearString2.yml | 1 - .../surroundingPair/parseTree/typescript/clearString3.yml | 1 - .../surroundingPair/parseTreeParity/chuckInsideRound.yml | 1 - .../recorded/surroundingPair/parseTreeParity/chuckPairRound.yml | 1 - .../recorded/surroundingPair/parseTreeParity/chuckRound2.yml | 1 - .../recorded/surroundingPair/parseTreeParity/clearCurly2.yml | 1 - .../surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml | 2 -- .../recorded/surroundingPair/parseTreeParity/clearRound9.yml | 1 - .../surroundingPair/parseTreeParity/takeInsideRound.yml | 1 - .../surroundingPair/parseTreeParity/takeInsideRound2.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside11.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside12.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside13.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside14.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside15.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside16.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside17.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside18.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside19.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside2.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside20.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside21.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside22.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside23.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside24.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside25.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside26.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside3.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside4.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside5.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside6.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside7.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside8.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeOutside9.yml | 1 - .../surroundingPair/parseTreeParity/takeOutsideLeper.yml | 1 - .../surroundingPair/parseTreeParity/takeOutsideRack.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takePairDouble.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takePairRound.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takePairRound2.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeQuad.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeQuad2.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeQuad3.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeQuad4.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeQuad5.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeQuad6.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound10.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound11.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound12.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound13.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound14.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound15.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound16.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound17.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound18.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound19.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound2.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound20.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound21.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound22.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound23.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound3.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound4.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound5.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound6.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound7.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound8.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRound9.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml | 1 - .../surroundingPair/parseTreeParity/takeRoundRepper.yml | 1 - .../recorded/surroundingPair/parseTreeParity/takeSquare.yml | 1 - .../recorded/surroundingPair/textual/chuckInsideRound.yml | 1 - .../recorded/surroundingPair/textual/chuckPairRound.yml | 1 - .../fixtures/recorded/surroundingPair/textual/chuckRound2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearCurly2.yml | 1 - .../surroundingPair/textual/clearOutsideGreenDouble.yml | 2 -- .../fixtures/recorded/surroundingPair/textual/clearPair.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair10.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair11.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair12.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair13.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair14.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair3.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair4.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair5.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair6.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair7.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair8.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearPair9.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearRound.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearRound9.yml | 1 - .../fixtures/recorded/surroundingPair/textual/clearString4.yml | 1 - .../recorded/surroundingPair/textual/tailTakeEscapedQuad.yml | 1 - .../recorded/surroundingPair/textual/takeEscapedQuad.yml | 1 - .../recorded/surroundingPair/textual/takeEscapedQuad2.yml | 1 - .../recorded/surroundingPair/textual/takeEscapedQuad3.yml | 1 - .../recorded/surroundingPair/textual/takeEscapedQuad4.yml | 1 - .../recorded/surroundingPair/textual/takeEscapedQuad5.yml | 1 - .../recorded/surroundingPair/textual/takeInsideRound.yml | 1 - .../recorded/surroundingPair/textual/takeInsideRound2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside10.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside11.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside12.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside13.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside14.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside15.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside16.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside17.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside18.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside19.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside20.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside21.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside22.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside23.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside24.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside25.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside26.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside27.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside3.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside4.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside5.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside6.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside7.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside8.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeOutside9.yml | 1 - .../recorded/surroundingPair/textual/takeOutsideFine.yml | 2 -- .../recorded/surroundingPair/textual/takeOutsideLeper.yml | 1 - .../recorded/surroundingPair/textual/takeOutsideRack.yml | 1 - .../recorded/surroundingPair/textual/takeOutsideUrge.yml | 2 -- .../recorded/surroundingPair/textual/takePairDouble.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takePairRound.yml | 1 - .../recorded/surroundingPair/textual/takePairRound2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeQuad.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeQuad2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeQuad3.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeQuad4.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeQuad5.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeQuad6.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRightQuad.yml | 1 - .../recorded/surroundingPair/textual/takeRightQuad2.yml | 1 - .../recorded/surroundingPair/textual/takeRightQuad3.yml | 1 - .../recorded/surroundingPair/textual/takeRightQuad4.yml | 1 - .../recorded/surroundingPair/textual/takeRightQuad5.yml | 1 - .../recorded/surroundingPair/textual/takeRightQuad6.yml | 1 - .../recorded/surroundingPair/textual/takeRightQuad7.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound10.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound11.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound12.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound13.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound14.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound15.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound16.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound17.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound18.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound19.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound2.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound20.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound21.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound22.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound23.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound3.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound4.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound5.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound6.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound7.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound8.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeRound9.yml | 1 - .../recorded/surroundingPair/textual/takeRoundLeper.yml | 1 - .../recorded/surroundingPair/textual/takeRoundRepper.yml | 1 - .../fixtures/recorded/surroundingPair/textual/takeSquare.yml | 1 - src/test/suite/fixtures/recorded/updateSelections/bringFine.yml | 1 - .../recorded/updateSelections/bringFineAfterThirdCarThis.yml | 1 - .../fixtures/recorded/updateSelections/bringFineAfterThis.yml | 1 - .../fixtures/recorded/updateSelections/bringFineAfterThis2.yml | 1 - .../fixtures/recorded/updateSelections/bringFineBeforeThis.yml | 1 - .../recorded/updateSelections/bringFineToFirstCarWhale.yml | 1 - .../recorded/updateSelections/bringFineToFirstTwoCar.yml | 1 - .../recorded/updateSelections/bringFineToLastCarWhale.yml | 1 - .../recorded/updateSelections/bringFineToLastTwoCar.yml | 1 - .../recorded/updateSelections/bringFineToThirdCarWhale.yml | 1 - .../fixtures/recorded/updateSelections/bringFineToWhale.yml | 1 - .../fixtures/recorded/updateSelections/bringFineToWhale2.yml | 1 - .../fixtures/recorded/updateSelections/bringFineToWhale3.yml | 1 - .../fixtures/recorded/updateSelections/bringFineToWhale4.yml | 1 - .../fixtures/recorded/updateSelections/bringFineToWhale5.yml | 1 - .../recorded/updateSelections/bringHarpToEndOfWhale.yml | 1 - .../bringHarpToFourthCarWhalePastSecondCarHarp.yml | 1 - .../bringHarpToSecondCarFinePastThirdCarHarp.yml | 1 - .../bringHarpToSecondCarFinePastThirdCarWhale.yml | 1 - .../recorded/updateSelections/bringHarpToStartOfWhale.yml | 1 - .../suite/fixtures/recorded/updateSelections/bringWhale.yml | 1 - .../fixtures/recorded/updateSelections/bringWhaleAfterFine.yml | 1 - .../fixtures/recorded/updateSelections/bringWhaleAfterThis.yml | 1 - .../fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml | 1 - .../fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml | 1 - .../recorded/updateSelections/bringWhaleToEndOfFine.yml | 1 - .../fixtures/recorded/updateSelections/bringWhaleToFine.yml | 1 - .../fixtures/recorded/updateSelections/chuckFirstCarWhale.yml | 1 - .../recorded/updateSelections/chuckFirstPastSecondCar.yml | 1 - .../recorded/updateSelections/chuckFourthPastFifthCar.yml | 1 - .../fixtures/recorded/updateSelections/chuckLastCarWhale.yml | 1 - .../updateSelections/chuckSecondCarFinePastThirdCarWhale.yml | 1 - .../recorded/updateSelections/chuckSecondPastThirdCar.yml | 1 - .../updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml | 1 - .../suite/fixtures/recorded/updateSelections/commentTrap.yml | 1 - 770 files changed, 775 deletions(-) diff --git a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml index b314d48a04..c3cea3e3fa 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml @@ -18,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 fcda3b0f4e..677b64079d 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml @@ -15,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 ad598c36a7..5e350fe8ae 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml @@ -16,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 09a6bb4ea4..ffaf9567ea 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml @@ -15,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 fa8cf1a4ae..59a4395e1b 100644 --- a/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml +++ b/src/test/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml @@ -16,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 b7d32def05..93166911b7 100644 --- a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml @@ -16,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 b4c9d1219a..9811e5e7f0 100644 --- a/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml @@ -16,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 93ac7b1f6b..c2faaf9f20 100644 --- a/src/test/suite/fixtures/recorded/actions/bringVest.yml +++ b/src/test/suite/fixtures/recorded/actions/bringVest.yml @@ -12,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 58f4e62450..e7a8553e87 100644 --- a/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml +++ b/src/test/suite/fixtures/recorded/actions/bringVestToCap.yml @@ -8,7 +8,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/actions/callFine.yml b/src/test/suite/fixtures/recorded/actions/callFine.yml index 0428833ea6..3ee548caf9 100644 --- a/src/test/suite/fixtures/recorded/actions/callFine.yml +++ b/src/test/suite/fixtures/recorded/actions/callFine.yml @@ -12,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 b538e73600..6d89f5d179 100644 --- a/src/test/suite/fixtures/recorded/actions/callVest.yml +++ b/src/test/suite/fixtures/recorded/actions/callVest.yml @@ -12,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 01e9f37041..527728e226 100644 --- a/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml +++ b/src/test/suite/fixtures/recorded/actions/callVestOnCap.yml @@ -8,7 +8,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/actions/carveVest.yml b/src/test/suite/fixtures/recorded/actions/carveVest.yml index 0397f9089a..0543ee2ae3 100644 --- a/src/test/suite/fixtures/recorded/actions/carveVest.yml +++ b/src/test/suite/fixtures/recorded/actions/carveVest.yml @@ -6,7 +6,6 @@ command: 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 294c5b37b9..86472f0f65 100644 --- a/src/test/suite/fixtures/recorded/actions/chuckVest.yml +++ b/src/test/suite/fixtures/recorded/actions/chuckVest.yml @@ -6,7 +6,6 @@ command: 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 8ca4e8ef44..639b485629 100644 --- a/src/test/suite/fixtures/recorded/actions/clearVest.yml +++ b/src/test/suite/fixtures/recorded/actions/clearVest.yml @@ -6,7 +6,6 @@ command: 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 eca5e6745b..e4a439691f 100644 --- a/src/test/suite/fixtures/recorded/actions/commentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/commentVest.yml @@ -6,7 +6,6 @@ command: 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 fc4602c808..6f0ae452bb 100644 --- a/src/test/suite/fixtures/recorded/actions/copyVest.yml +++ b/src/test/suite/fixtures/recorded/actions/copyVest.yml @@ -6,7 +6,6 @@ command: 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 cd2a06b0a0..d1c2079faf 100644 --- a/src/test/suite/fixtures/recorded/actions/dedentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dedentVest.yml @@ -6,7 +6,6 @@ command: 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 0823b52cf1..a1beca3ae8 100644 --- a/src/test/suite/fixtures/recorded/actions/drinkVest.yml +++ b/src/test/suite/fixtures/recorded/actions/drinkVest.yml @@ -6,7 +6,6 @@ command: 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 a58e3c1ae3..4b526729e5 100644 --- a/src/test/suite/fixtures/recorded/actions/dropVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dropVest.yml @@ -6,7 +6,6 @@ command: 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 3a44a8dc69..98ca47a82f 100644 --- a/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dupeUpVest.yml @@ -6,7 +6,6 @@ command: 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 60546918ef..b3cd0c2a37 100644 --- a/src/test/suite/fixtures/recorded/actions/dupeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/dupeVest.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/floatVest.yml b/src/test/suite/fixtures/recorded/actions/floatVest.yml index 2a108e3112..da3a3beb0b 100644 --- a/src/test/suite/fixtures/recorded/actions/floatVest.yml +++ b/src/test/suite/fixtures/recorded/actions/floatVest.yml @@ -6,7 +6,6 @@ command: 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 c53cfec482..634a2cfa07 100644 --- a/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveAfterDot.yml @@ -7,7 +7,6 @@ command: - 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 9527300319..2f0ae65c72 100644 --- a/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml +++ b/src/test/suite/fixtures/recorded/actions/giveAirAndBang.yml @@ -10,7 +10,6 @@ command: 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 125ea064bf..727f95b72e 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBat.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBat.yml @@ -6,7 +6,6 @@ command: 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 18c60b256a..5fe1fb502a 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBat2.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBat2.yml @@ -6,7 +6,6 @@ command: 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 9ee7f16dea..2697470d01 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBeforeDot.yml @@ -7,7 +7,6 @@ command: - 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 b4605ece34..05e4e752a9 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBlueQuote.yml @@ -6,7 +6,6 @@ command: 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 6cc636fc3b..7fad4f09e0 100644 --- a/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml @@ -10,7 +10,6 @@ command: 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 5fb62bbb60..f537023237 100644 --- a/src/test/suite/fixtures/recorded/actions/giveCap.yml +++ b/src/test/suite/fixtures/recorded/actions/giveCap.yml @@ -6,7 +6,6 @@ command: 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 db59bf797e..20cc6dde70 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDot.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDot.yml @@ -6,7 +6,6 @@ command: 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 79c54bb257..3565a5d868 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDot2.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDot2.yml @@ -6,7 +6,6 @@ command: 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 9adbcbc26a..3559ec1365 100644 --- a/src/test/suite/fixtures/recorded/actions/giveDrum.yml +++ b/src/test/suite/fixtures/recorded/actions/giveDrum.yml @@ -6,7 +6,6 @@ command: 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 1a8a8629f0..4e64913ce3 100644 --- a/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml +++ b/src/test/suite/fixtures/recorded/actions/giveEqualsPastColon.yml @@ -13,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 eb1172ddf1..a6c2523b44 100644 --- a/src/test/suite/fixtures/recorded/actions/giveHarp.yml +++ b/src/test/suite/fixtures/recorded/actions/giveHarp.yml @@ -6,7 +6,6 @@ command: 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 7e0caece70..571cc2b804 100644 --- a/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml +++ b/src/test/suite/fixtures/recorded/actions/giveHarpAndWhale.yml @@ -10,7 +10,6 @@ command: 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 66bacfb60a..cc63630faf 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuote.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuote.yml @@ -6,7 +6,6 @@ command: 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 bc8c148a66..35e0aa6e77 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuoteAndAir.yml @@ -10,7 +10,6 @@ command: 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 55866a2a6c..7abfe83c46 100644 --- a/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml +++ b/src/test/suite/fixtures/recorded/actions/giveQuoteAndBang.yml @@ -10,7 +10,6 @@ command: 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 751f8e3ce1..6bd28bf865 100644 --- a/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml +++ b/src/test/suite/fixtures/recorded/actions/giveVestAndHarp.yml @@ -10,7 +10,6 @@ command: 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 06ec948f09..b2b80455df 100644 --- a/src/test/suite/fixtures/recorded/actions/indentVest.yml +++ b/src/test/suite/fixtures/recorded/actions/indentVest.yml @@ -6,7 +6,6 @@ command: 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 84776a553a..fe708209ba 100644 --- a/src/test/suite/fixtures/recorded/actions/moveVest.yml +++ b/src/test/suite/fixtures/recorded/actions/moveVest.yml @@ -12,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 65adb75eca..3fc66eeb51 100644 --- a/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml +++ b/src/test/suite/fixtures/recorded/actions/moveVestToCap.yml @@ -8,7 +8,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/actions/pasteCap.yml b/src/test/suite/fixtures/recorded/actions/pasteCap.yml index 4b7ad4531b..0cfeff6cd9 100644 --- a/src/test/suite/fixtures/recorded/actions/pasteCap.yml +++ b/src/test/suite/fixtures/recorded/actions/pasteCap.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: c} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/postVest.yml b/src/test/suite/fixtures/recorded/actions/postVest.yml index eda32ac6fb..1785260b58 100644 --- a/src/test/suite/fixtures/recorded/actions/postVest.yml +++ b/src/test/suite/fixtures/recorded/actions/postVest.yml @@ -6,7 +6,6 @@ command: 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 ebd82e1e3c..8d7e4594d4 100644 --- a/src/test/suite/fixtures/recorded/actions/pourVest.yml +++ b/src/test/suite/fixtures/recorded/actions/pourVest.yml @@ -6,7 +6,6 @@ command: 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 87143b9e72..297df7b822 100644 --- a/src/test/suite/fixtures/recorded/actions/preeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/preeVest.yml @@ -6,7 +6,6 @@ command: 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 8c7567c6de..b6db2e5e6a 100644 --- a/src/test/suite/fixtures/recorded/actions/puffVest.yml +++ b/src/test/suite/fixtures/recorded/actions/puffVest.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: v} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml b/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml index 631d1152c5..4a49f2cb56 100644 --- a/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml +++ b/src/test/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml @@ -12,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/sortAirAndCapAndBat.yml b/src/test/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml index 0c698a48dc..faad9d02e3 100644 --- a/src/test/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml +++ b/src/test/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml @@ -12,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 24ea469cba..8ebdf1eaee 100644 --- a/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml +++ b/src/test/suite/fixtures/recorded/actions/swapVestWithCap.yml @@ -8,7 +8,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/actions/swapWithVest.yml b/src/test/suite/fixtures/recorded/actions/swapWithVest.yml index 5a67015967..4aad913b81 100644 --- a/src/test/suite/fixtures/recorded/actions/swapWithVest.yml +++ b/src/test/suite/fixtures/recorded/actions/swapWithVest.yml @@ -7,7 +7,6 @@ command: - {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 112c74ff93..8b9bd0c4b2 100644 --- a/src/test/suite/fixtures/recorded/actions/takeVest.yml +++ b/src/test/suite/fixtures/recorded/actions/takeVest.yml @@ -6,7 +6,6 @@ command: 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 54c53532a8..553c2b9f2b 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml @@ -12,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 820938d4f9..3481507a0c 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml @@ -13,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 95e03ac735..7618b29400 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml @@ -12,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 5354674e0f..947180ec4c 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml @@ -13,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 f433b182f8..6782ffba97 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml @@ -11,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 1eb281001c..bba6b0076b 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastEndOfToken.yml @@ -9,7 +9,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/compoundTargets/takePastStartOfToken.yml b/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml index 467f51d0cf..df023a9e28 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastStartOfToken.yml @@ -9,7 +9,6 @@ command: 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 e427252792..0417f55013 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takePastTrap.yml @@ -11,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 9f8345e2ea..6821a56158 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml @@ -11,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 3ad9dfa34f..1560b1352d 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml @@ -13,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 2abefb523a..efe1009b9b 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml @@ -13,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 14b7959447..1ea8db06b6 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml @@ -13,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 dd3dfebb52..45583043e7 100644 --- a/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml +++ b/src/test/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml @@ -13,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/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml index 325aa9596e..2e6dc406eb 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml @@ -10,7 +10,6 @@ command: 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/hatTokenMap/bringCommaToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml index 392e0ea977..5d332258e9 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml @@ -10,7 +10,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml index 7fba543618..63595f3e82 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml @@ -10,7 +10,6 @@ command: position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml index aa9fb6c34c..30dc8f8444 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml @@ -9,7 +9,6 @@ command: - 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/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml index fb480137c3..47adf5fb01 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml @@ -20,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/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml index 681b5b8e2d..deee28f351 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml @@ -18,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/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml index 3a5265187b..455efe3062 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml @@ -9,7 +9,6 @@ command: - 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/hatTokenMap/bringHarpTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml index 3472ae39b2..9aca0390d2 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml @@ -12,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/hatTokenMap/bringHarpToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml index ba045e698d..ab28df027b 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml @@ -10,7 +10,6 @@ command: position: after insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml index 97eab19696..678dac4669 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml @@ -10,7 +10,6 @@ command: position: before insideOutsideType: inside mark: {type: decoratedSymbol, symbolColor: default, character: .} - extraArgs: [] marksToCheck: [default..] initialState: documentContents: " . , hello" diff --git a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml index 59adc9d764..6c31393f78 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml @@ -10,7 +10,6 @@ command: 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/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml index cb26f92199..a800665a71 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml @@ -11,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/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml index 9fc12b12de..f31659fb46 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml @@ -22,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/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml index 7662a4c160..784ab6dbb6 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml @@ -20,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/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml index 8399527ff5..a572792994 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml @@ -20,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/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml index dc2d79b930..c800f11648 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml @@ -24,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/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml index f17a1fba1d..fd08052d86 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml @@ -18,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/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml index 0741fd1415..ab7bc37076 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml @@ -22,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/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml index 182c5b6588..9e6aa159a5 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml @@ -24,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/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml index 25c147f131..b24e9fdfa7 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml @@ -10,7 +10,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/bringPointToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml index 95126fc9ee..b30e138d29 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml @@ -10,7 +10,6 @@ command: 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/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml index 9a9d04ef4d..9128e9e277 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml @@ -10,7 +10,6 @@ command: 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/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml index 87ce2b4e31..590102154e 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml @@ -8,7 +8,6 @@ command: 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/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml index f7c7313e29..47648981fc 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml @@ -17,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/hatTokenMap/chuckHarpPastAirTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml index c7ebab9917..112f11b646 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml @@ -13,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/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml index 1707aa302b..1a1b6b8a69 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml @@ -8,7 +8,6 @@ command: 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/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml index 34858d6494..428b427208 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml @@ -8,7 +8,6 @@ command: 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/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml index 4ca54fec0a..4ce21734da 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml @@ -17,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/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml index 1498d6eb3c..213464506d 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml @@ -21,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 index 7f662380d6..fe5a4660b2 100644 --- a/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml +++ b/src/test/suite/fixtures/recorded/hatTokenMap/takeHarp.yml @@ -6,8 +6,6 @@ command: targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: h} - extraArgs: [] - usePrePhraseSnapshot: true initialState: documentContents: hello world selections: diff --git a/src/test/suite/fixtures/recorded/headTail/takeHead.yml b/src/test/suite/fixtures/recorded/headTail/takeHead.yml index 92f5fa391b..bb79b235da 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeHead.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeHead.yml @@ -6,7 +6,6 @@ command: 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 d4d1a2c760..9ba4107233 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeHeadVest.yml @@ -7,7 +7,6 @@ command: - 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 2b7f33193d..fe6fee9190 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeTail.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeTail.yml @@ -6,7 +6,6 @@ command: 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 746d8f715c..7e188370ab 100644 --- a/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml +++ b/src/test/suite/fixtures/recorded/headTail/takeTailVest.yml @@ -7,7 +7,6 @@ command: - 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 4fe728390b..872ae67610 100644 --- a/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml +++ b/src/test/suite/fixtures/recorded/inference/bringLineBatPastEndOfFunkToThis.yml @@ -18,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 f80cf6c87f..d8f2840e1f 100644 --- a/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml +++ b/src/test/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml @@ -10,7 +10,6 @@ command: - 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 1e24d18094..a1a89d2f7e 100644 --- a/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml +++ b/src/test/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml @@ -10,7 +10,6 @@ command: - 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 199b24f882..96be9527ea 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToLine.yml @@ -7,7 +7,6 @@ command: - 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 d888238014..27c82ea167 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToState.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToState.yml @@ -8,7 +8,6 @@ command: 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 996530f2ec..6ff184be22 100644 --- a/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml +++ b/src/test/suite/fixtures/recorded/inference/bringOddToToken.yml @@ -7,7 +7,6 @@ command: - 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 610b10a5c6..8022765b75 100644 --- a/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml +++ b/src/test/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml @@ -10,7 +10,6 @@ command: - 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/takeAfterVestPastAir.yml b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml index 8e38a200b5..e2fad04ab8 100644 --- a/src/test/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml @@ -14,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 59f44d517f..c3ceea94ae 100644 --- a/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml @@ -15,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 8994934611..6e5f49c16c 100644 --- a/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml +++ b/src/test/suite/fixtures/recorded/inference/takeAirPastEndOfLine.yml @@ -11,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 ddd88473e4..c59e4e8c65 100644 --- a/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml +++ b/src/test/suite/fixtures/recorded/inference/takeEachPastStartOfLine.yml @@ -11,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 54b51855d7..adf7d5938f 100644 --- a/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml +++ b/src/test/suite/fixtures/recorded/inference/takeFirstWord.yml @@ -7,7 +7,6 @@ command: - 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 09147aa133..cafe966529 100644 --- a/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml @@ -11,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 d7d30ea34b..b29f093310 100644 --- a/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml @@ -14,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 c8a67605d4..3fe4792521 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLastChar.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLastChar.yml @@ -7,7 +7,6 @@ command: - 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 87dda76e02..e125c2e9ce 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLinePastAir.yml @@ -11,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 984a68db9d..5465682771 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLineVestAndAir.yml @@ -11,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 25946ecdf3..ac5fe6552f 100644 --- a/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeLineVestPastAir.yml @@ -14,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 2a947073b7..0d0fcbf0ea 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastEndOfState.yml @@ -15,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 ff1cb2be46..ddc3d77c9f 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastLine.yml @@ -11,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 c25e0bc6bf..bbaad354ac 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastState.yml @@ -13,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 2171bc9e35..59abd6b2a9 100644 --- a/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml +++ b/src/test/suite/fixtures/recorded/inference/takeOddPastToken.yml @@ -11,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 f8e682f085..40f6bb800b 100644 --- a/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takePastLineAir.yml @@ -12,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 8744c06f64..73fe368199 100644 --- a/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml @@ -11,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 e8bbd628fc..2272e7f2c4 100644 --- a/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml +++ b/src/test/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml @@ -14,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 f71eb4c6d9..f3be7250d7 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestAndLineAir.yml @@ -11,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 49dc9e5aa9..8fcfd71f9d 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml @@ -14,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 fc905ea2e9..5efeab04bc 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml @@ -14,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 22584e8d8b..a9c45a73ac 100644 --- a/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml +++ b/src/test/suite/fixtures/recorded/inference/takeVestPastLineAir.yml @@ -14,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 f8c1755db7..77b25fb2af 100644 --- a/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/c/clearFunk.yml @@ -6,7 +6,6 @@ command: 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 5ef6ab55e4..c4d1cee0c4 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml @@ -7,7 +7,6 @@ command: - 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 31bef30c37..3786a4bfd3 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml @@ -7,7 +7,6 @@ command: - 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/takeArg.yml b/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml index c633ce6b79..5d4f7a25e7 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeArg.yml @@ -6,7 +6,6 @@ command: 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 5c26dce6e0..bf44ce5fef 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeArg2.yml @@ -6,7 +6,6 @@ command: 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 4d1a109bc9..9a7257a9ab 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeAttribute.yml @@ -6,7 +6,6 @@ command: 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 5d845182eb..34421062b0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeCall.yml @@ -6,7 +6,6 @@ command: 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 373444fa9a..8a35e194dc 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClass.yml @@ -6,7 +6,6 @@ command: 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 ef4a7118f6..5718336335 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClass2.yml @@ -6,7 +6,6 @@ command: 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 dfd0365918..6a8ffaafdc 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName.yml @@ -6,7 +6,6 @@ command: 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 a638fab0e3..23de3e8ebe 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName2.yml @@ -6,7 +6,6 @@ command: 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 e22dbf58a2..26a142f736 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeClassName3.yml @@ -6,7 +6,6 @@ command: 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 d49cff3b86..8465701ef1 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeComment.yml @@ -6,7 +6,6 @@ command: 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 95de817ef3..12729ba3ad 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml @@ -6,7 +6,6 @@ command: 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 b6cd01d064..998916b972 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml @@ -6,7 +6,6 @@ command: 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 230f5c8695..d78c281424 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk.yml @@ -6,7 +6,6 @@ command: 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 085efa8927..b87cc4c703 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunk2.yml @@ -6,7 +6,6 @@ command: 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 ab99266135..330ba9321a 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName.yml @@ -6,7 +6,6 @@ command: 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 b9ecef4bf6..1f934433cb 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml @@ -6,7 +6,6 @@ command: 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 973736c864..ac10cad068 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml @@ -6,7 +6,6 @@ command: 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 06fc16aa0c..be7c6b1fb3 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeIf.yml @@ -6,7 +6,6 @@ command: 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 5918a995c7..4a7008a58a 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeIf2.yml @@ -6,7 +6,6 @@ command: 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 1fd60f54d8..93fd92e8ed 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeItem.yml @@ -6,7 +6,6 @@ command: 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 a18c64c1e9..654fb3bbd4 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeItem2.yml @@ -6,7 +6,6 @@ command: 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 84a220bdfb..bfb335af0e 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeLambda.yml @@ -6,7 +6,6 @@ command: 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 83ad7ed53f..a1d3403c58 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeList.yml @@ -6,7 +6,6 @@ command: 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 c9f764ec78..8c2f702141 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeList2.yml @@ -6,7 +6,6 @@ command: 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 f37f9bdf1a..7228e0dde0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName.yml @@ -6,7 +6,6 @@ command: 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 6c9aed56c1..2d6fbc3341 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName2.yml @@ -6,7 +6,6 @@ command: 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 6d1bafda21..31a382d5b0 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeName3.yml @@ -6,7 +6,6 @@ command: 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 e85566cdc3..97c77b2ee8 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState.yml @@ -6,7 +6,6 @@ command: 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 ad2d0b77bc..49cc40f896 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState2.yml @@ -6,7 +6,6 @@ command: 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 381782602c..e1d54b5226 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeState3.yml @@ -6,7 +6,6 @@ command: 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 fab11675dd..3ad6207626 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeString.yml @@ -6,7 +6,6 @@ command: 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 89200c58ee..50511ab9dd 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType.yml @@ -6,7 +6,6 @@ command: 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 ec97bd875e..2d3467da82 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType2.yml @@ -6,7 +6,6 @@ command: 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 eec9e98bb4..635e152670 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeType3.yml @@ -6,7 +6,6 @@ command: 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 66e56ebdcc..457bddea59 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue.yml @@ -6,7 +6,6 @@ command: 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 5bcf3bdf00..13acfb009e 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue2.yml @@ -6,7 +6,6 @@ command: 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 fe4e63dea0..39e570fb38 100644 --- a/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml +++ b/src/test/suite/fixtures/recorded/languages/cpp/takeValue3.yml @@ -6,7 +6,6 @@ command: 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/csharp/chuckTypeSoon.yml b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml index 8c9ade026f..1ccce27179 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml @@ -7,7 +7,6 @@ command: - 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 5cb3208cb8..450bcf8344 100644 --- a/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml +++ b/src/test/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml @@ -7,7 +7,6 @@ command: - 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/java/chuckTypeNear.yml b/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml index 84e2099946..6501816cea 100644 --- a/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml +++ b/src/test/suite/fixtures/recorded/languages/java/chuckTypeNear.yml @@ -7,7 +7,6 @@ command: - 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 fc6135e184..62d66a373e 100644 --- a/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml +++ b/src/test/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml @@ -7,7 +7,6 @@ command: - 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/takeArg.yml b/src/test/suite/fixtures/recorded/languages/java/takeArg.yml index b89b9a04d9..ed5d87771b 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeArg.yml @@ -6,7 +6,6 @@ command: 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 f20881475b..b57242acaf 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeArg2.yml @@ -6,7 +6,6 @@ command: 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 3d5e4961cc..469dd20f6d 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCall.yml @@ -6,7 +6,6 @@ command: 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 9b8ba90eec..1c31349b1e 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeClass.yml @@ -6,7 +6,6 @@ command: 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 0eec5f58fa..3e1b78c775 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeClassName.yml @@ -6,7 +6,6 @@ command: 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 5f6d6aae09..dc99db2903 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeComment.yml @@ -6,7 +6,6 @@ command: 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 6595695ed3..67fef48846 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition.yml @@ -6,7 +6,6 @@ command: 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 ea2c3fa052..aa14f412d3 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition2.yml @@ -6,7 +6,6 @@ command: 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 6521eac34e..6ec2874ef6 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeCondition3.yml @@ -6,7 +6,6 @@ command: 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 9b1d43cdca..b24537334f 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg.yml @@ -6,7 +6,6 @@ command: 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 bd2ab0b151..9974d5688c 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryArg2.yml @@ -6,7 +6,6 @@ command: 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 371cdb4aaf..db670eefbf 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeEveryItem.yml @@ -6,7 +6,6 @@ command: 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 5ffd5bda6b..1a3d8e3ab9 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunk.yml @@ -6,7 +6,6 @@ command: 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 f3c12cf42f..c5c60983ab 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunk2.yml @@ -6,7 +6,6 @@ command: 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 2725985ab2..2d41869611 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunkName.yml @@ -6,7 +6,6 @@ command: 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 e72633dcb5..62eb840055 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeFunkName2.yml @@ -6,7 +6,6 @@ command: 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 f7d755caf6..850e45c323 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeIf.yml @@ -6,7 +6,6 @@ command: 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 03cab5b838..44cd7f9353 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeItem.yml @@ -6,7 +6,6 @@ command: 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 b26ee06ba4..746865f1ef 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeList.yml @@ -6,7 +6,6 @@ command: 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 cc29dc3981..0c6617783e 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeMap.yml @@ -6,7 +6,6 @@ command: 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 8bd6e1955c..2ed15fc67a 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName.yml @@ -6,7 +6,6 @@ command: 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 1fcb562012..97bf322871 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName2.yml @@ -6,7 +6,6 @@ command: 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 fa8d06b98c..c553c8ba89 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeName3.yml @@ -6,7 +6,6 @@ command: 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 414c87f351..5d1ba65e51 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeState.yml @@ -6,7 +6,6 @@ command: 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 4b518e795a..3e3a346cf5 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeString.yml @@ -6,7 +6,6 @@ command: 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 5d6e42dcba..34dfccd974 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType.yml @@ -6,7 +6,6 @@ command: 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 58bd78da62..a2c427fc9c 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType2.yml @@ -6,7 +6,6 @@ command: 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 e6ba340475..be9c5ace80 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeType3.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeType3.yml @@ -6,7 +6,6 @@ command: 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 af62d9cd05..e0b32996c3 100644 --- a/src/test/suite/fixtures/recorded/languages/java/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/java/takeValue.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: containingScope, scopeType: value} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/json/takeItem.yml b/src/test/suite/fixtures/recorded/languages/json/takeItem.yml index f59734ad5a..8b5b7633db 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeItem.yml @@ -6,7 +6,6 @@ command: 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 213450e009..4dea39a194 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeItem2.yml @@ -6,7 +6,6 @@ command: 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 19cf73288c..6ccd9b9dd6 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeKey.yml @@ -6,7 +6,6 @@ command: 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 20b738132d..4df3f4ca47 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeList.yml @@ -6,7 +6,6 @@ command: 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 46715f3eed..aac2c213ca 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeString.yml @@ -6,7 +6,6 @@ command: 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 2cadf11204..20e692db54 100644 --- a/src/test/suite/fixtures/recorded/languages/json/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/json/takeValue.yml @@ -6,7 +6,6 @@ command: 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 8abf188cc3..c4d5eeeec9 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeAttribute.yml @@ -6,7 +6,6 @@ command: 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 7cad36b307..982626ccf5 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeElement.yml @@ -6,7 +6,6 @@ command: 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 a78f5aee60..49cc6c24ce 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeEndTag.yml @@ -6,7 +6,6 @@ command: 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 153b06d4c8..8905d32546 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml @@ -6,7 +6,6 @@ command: 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 b035d029f5..e5bb2e8265 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeKey.yml @@ -6,7 +6,6 @@ command: 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 374b314c09..a0e9ec577a 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeStartTag.yml @@ -6,7 +6,6 @@ command: 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 108616b48d..0ef5356ed5 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeTags.yml @@ -6,7 +6,6 @@ command: 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 90ca1b6d92..b1c834b296 100644 --- a/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/jsx/takeValue.yml @@ -6,7 +6,6 @@ command: 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 716d02b3bc..38f45aa8c6 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckKey.yml @@ -6,7 +6,6 @@ command: 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 4cc229c3a7..e273a6775e 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckKey2.yml @@ -6,7 +6,6 @@ command: 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 131fdb857a..64f93527a5 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckType.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckType.yml @@ -6,7 +6,6 @@ command: 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 f8a688daa4..c5b9597555 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml @@ -7,7 +7,6 @@ command: - 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 2b35780c52..e217856e45 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml @@ -7,7 +7,6 @@ command: - 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 878b2e6a61..ecb3e56146 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckValue.yml @@ -6,7 +6,6 @@ command: 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 9cff9b5a2e..d1fc53f432 100644 --- a/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/chuckValue2.yml @@ -6,7 +6,6 @@ command: 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 cc37836e76..445ae8529e 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearEveryValue.yml @@ -6,7 +6,6 @@ command: 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 bed990b80a..0b9c08e225 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearValue.yml @@ -6,7 +6,6 @@ command: 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 ab1f4db167..8039c0d604 100644 --- a/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/clearValue2.yml @@ -6,7 +6,6 @@ command: 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/takeArg.yml b/src/test/suite/fixtures/recorded/languages/python/takeArg.yml index 67339d486b..9c8947a8e1 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeArg.yml @@ -6,7 +6,6 @@ command: 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 5e0960304d..bddf4bb33a 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeArg2.yml @@ -6,7 +6,6 @@ command: 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 f39b38d850..de09da9a18 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCall.yml @@ -6,7 +6,6 @@ command: 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 9b2bdb3c35..98546a0292 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClass.yml @@ -6,7 +6,6 @@ command: 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 831c1b8624..0cb9c7995d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClass2.yml @@ -6,7 +6,6 @@ command: 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 aa9a8e5616..b6fa235281 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeClassName.yml @@ -6,7 +6,6 @@ command: 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 d1c9aaea0d..22586b6330 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeComment.yml @@ -6,7 +6,6 @@ command: 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 fce545aa9f..a566c913db 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCondition.yml @@ -6,7 +6,6 @@ command: 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 db602ca6f9..24712f0dd7 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeCondition2.yml @@ -6,7 +6,6 @@ command: 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 d1473ca29b..19ff2e0574 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg.yml @@ -6,7 +6,6 @@ command: 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 dfa5d0e1f2..46a3d67bea 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryArg2.yml @@ -6,7 +6,6 @@ command: 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 7eda585583..86069db710 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem.yml @@ -6,7 +6,6 @@ command: 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 7d1f374616..a9379d87ea 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem2.yml @@ -6,7 +6,6 @@ command: 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 5ca44bcc22..8096ecd3f9 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeEveryItem3.yml @@ -6,7 +6,6 @@ command: 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 2e1ddaae47..499d7cab6a 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunk.yml @@ -6,7 +6,6 @@ command: 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 f97f2d4c5e..c41b35ee78 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunk2.yml @@ -6,7 +6,6 @@ command: 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 032b3045e8..d7aaed8fae 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeFunkName.yml @@ -6,7 +6,6 @@ command: 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 c4962e1172..33eb9a2dbf 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeIf.yml @@ -6,7 +6,6 @@ command: 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 5458a1335d..8dd3a0f787 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem.yml @@ -6,7 +6,6 @@ command: 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 187404be88..ddc95a1f2f 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem2.yml @@ -6,7 +6,6 @@ command: 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 aa4719ef33..cee30f2163 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeItem3.yml @@ -6,7 +6,6 @@ command: 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 bd83c13c15..6360270c26 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeKey.yml @@ -6,7 +6,6 @@ command: 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 21d799ce8c..9e8157d31d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambda.yml @@ -6,7 +6,6 @@ command: 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 7f1aad4d10..ed35b6f4f9 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambdaMade.yml @@ -7,7 +7,6 @@ command: - 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 008678d49f..a6b298ce99 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeLambdaPit.yml @@ -7,7 +7,6 @@ command: - 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 980e3a939d..10a33da827 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeList.yml @@ -6,7 +6,6 @@ command: 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 2a8ecce94c..fcf4c7511d 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeList2.yml @@ -6,7 +6,6 @@ command: 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 455235412a..f081270564 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeMap.yml @@ -6,7 +6,6 @@ command: 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 82a0eada92..c9d244eadc 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName.yml @@ -6,7 +6,6 @@ command: 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 98731e4e81..7b3c1d7ffc 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName2.yml @@ -6,7 +6,6 @@ command: 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 d36e39b62c..4fa80b0f77 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeName3.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeName3.yml @@ -6,7 +6,6 @@ command: 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 7f8e588e93..aa70dd2c16 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeState.yml @@ -6,7 +6,6 @@ command: 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 23354bffa3..0ff66931d4 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeString.yml @@ -6,7 +6,6 @@ command: 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 abc87229b5..122520710f 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeType.yml @@ -6,7 +6,6 @@ command: 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 7e5327c18c..084814f9c5 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeType2.yml @@ -6,7 +6,6 @@ command: 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 2796ec3943..93ea5e8fa3 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValue.yml @@ -6,7 +6,6 @@ command: 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 a193f52b4e..dcd5ccf766 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValue2.yml @@ -6,7 +6,6 @@ command: 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 981cdb9ec5..046ed45fa9 100644 --- a/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml +++ b/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml @@ -7,7 +7,6 @@ command: - 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/typescript/chuckKey.yml b/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml index cea1300196..443a37634e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckKey.yml @@ -6,7 +6,6 @@ command: 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 aad77934a0..583489d80e 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml @@ -7,7 +7,6 @@ command: - 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 efbd00df43..e13e7bfb59 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml @@ -7,7 +7,6 @@ command: - 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 e9e543c1d8..db5007f49c 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml @@ -7,7 +7,6 @@ command: - 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 7d414c48e8..aea2e9aa2b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml @@ -7,7 +7,6 @@ command: - 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 abc9fec8e2..432653961b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml @@ -7,7 +7,6 @@ command: - 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 46ee50bf94..3eade2f5a9 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk.yml @@ -6,7 +6,6 @@ command: 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 404abc929e..26dc5bccc7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearFunk2.yml @@ -6,7 +6,6 @@ command: 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 250ded9d96..95017e1f16 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearKey.yml @@ -6,7 +6,6 @@ command: 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 0c13e298a7..2460a946ad 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda.yml @@ -6,7 +6,6 @@ command: 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 d633f9e9b6..52a5ed28e3 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda2.yml @@ -6,7 +6,6 @@ command: 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 ebf68e8b5a..80b5332710 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda3.yml @@ -6,7 +6,6 @@ command: 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 cd90a175e0..a01bc490b4 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/clearLambda4.yml @@ -6,7 +6,6 @@ command: 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/takeArg.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml index 3ba4e8136a..c99ef33358 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArg.yml @@ -6,7 +6,6 @@ command: 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 c91868c800..b721c2d93f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArg2.yml @@ -6,7 +6,6 @@ command: 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 7e2cef2247..406fa70b17 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeArrow.yml @@ -6,7 +6,6 @@ command: 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 e5842d9a56..743c490365 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCall.yml @@ -6,7 +6,6 @@ command: 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 d4d77a0c28..b74ef46c83 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeClass.yml @@ -6,7 +6,6 @@ command: 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 36dfbcc8f6..841869a53b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeClassName.yml @@ -6,7 +6,6 @@ command: 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 26946ae28e..90e4846dc8 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeComment.yml @@ -6,7 +6,6 @@ command: 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 e08bee8202..dc84f6a8f2 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition.yml @@ -6,7 +6,6 @@ command: 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 28d35b47ba..6871a0ae09 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition2.yml @@ -6,7 +6,6 @@ command: 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 e69177b5f4..771b50e5a2 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeCondition3.yml @@ -6,7 +6,6 @@ command: 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 c59fb8a8c8..b9ef37a268 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml @@ -7,7 +7,6 @@ command: - 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 504a8bf6a3..f2195d7bab 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml @@ -7,7 +7,6 @@ command: - 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 89c47587b6..9ab231825c 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml @@ -7,7 +7,6 @@ command: - 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 75f5654640..16c929b204 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml @@ -6,7 +6,6 @@ command: 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 f1dc340928..ec4d2eafca 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml @@ -6,7 +6,6 @@ command: 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 d19217cf41..fa297bb639 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml @@ -6,7 +6,6 @@ command: 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 634355550a..af7334675f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml @@ -6,7 +6,6 @@ command: 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 8f482f4eac..77273f2662 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml @@ -6,7 +6,6 @@ command: 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 b79d836291..1434eae771 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml @@ -6,7 +6,6 @@ command: 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 58eb860d9e..6bd5bac823 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml @@ -6,7 +6,6 @@ command: 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 15576b759d..2dc738d9ec 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk.yml @@ -6,7 +6,6 @@ command: 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 0aef97946e..78fb8fa266 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk10.yml @@ -6,7 +6,6 @@ command: 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 2404699d1e..dbe2573f2d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk11.yml @@ -6,7 +6,6 @@ command: 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 05a305b187..8828cdb518 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk12.yml @@ -6,7 +6,6 @@ command: 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 e8f4742074..5b7a665361 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk13.yml @@ -6,7 +6,6 @@ command: 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 44e7028551..002c52efbf 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk2.yml @@ -6,7 +6,6 @@ command: 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 c4fb94b8cb..9759b32086 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk3.yml @@ -6,7 +6,6 @@ command: 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 4669e25c8b..5e4d1f887f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk4.yml @@ -6,7 +6,6 @@ command: 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 1c5d80e22e..701e6b13cb 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk5.yml @@ -6,7 +6,6 @@ command: 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 4e00097e1a..beab594c75 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk6.yml @@ -6,7 +6,6 @@ command: 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 68438ab037..a690b85262 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk7.yml @@ -6,7 +6,6 @@ command: 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 64c194ee29..69b512d04d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk8.yml @@ -6,7 +6,6 @@ command: 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 0a904efaca..4f2e8f24ad 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunk9.yml @@ -6,7 +6,6 @@ command: 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 a9342c1d9d..ae000d99fd 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName.yml @@ -6,7 +6,6 @@ command: 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 405c666d05..b6f87181a6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml @@ -6,7 +6,6 @@ command: 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 cc5f03bcfc..26d8edc501 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml @@ -6,7 +6,6 @@ command: 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 242e581335..3e3d9fb3d5 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml @@ -6,7 +6,6 @@ command: 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 b8ccab813a..23e6830390 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml @@ -6,7 +6,6 @@ command: 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 ffd098a38d..bd93be6932 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml @@ -6,7 +6,6 @@ command: 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 6d8ab7e010..a39b14eb3a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml @@ -6,7 +6,6 @@ command: 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 62e6f9fdff..31892438af 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml @@ -6,7 +6,6 @@ command: 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 5f9437c5a6..8760b43fe6 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml @@ -6,7 +6,6 @@ command: 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 7334202016..9cc39100bf 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml @@ -6,7 +6,6 @@ command: 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 f2a4d836d2..195ca75d91 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml @@ -6,7 +6,6 @@ command: 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 1ae61434a4..1c944be180 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeIf.yml @@ -6,7 +6,6 @@ command: 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 03ff0fa679..9f65586ae3 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem.yml @@ -6,7 +6,6 @@ command: 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 69658cb661..ae5b5043c7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem2.yml @@ -6,7 +6,6 @@ command: 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 6e97bc8d7b..5be200d04d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem3.yml @@ -6,7 +6,6 @@ command: 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 b6ba21f01e..d6669e85c1 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItem4.yml @@ -6,7 +6,6 @@ command: 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 7ed2f79d2b..2bc76aa612 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemAir.yml @@ -7,7 +7,6 @@ command: - 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 d2016e1bf5..a562da0bfb 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemBrace.yml @@ -7,7 +7,6 @@ command: - 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 a7bda0cc95..95ee786767 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemComma.yml @@ -7,7 +7,6 @@ command: - 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 486109c8dc..9a65704f0f 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeItemOne.yml @@ -7,7 +7,6 @@ command: - 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 38d71316eb..7653ea1456 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeKey.yml @@ -6,7 +6,6 @@ command: 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 c1baef0f6c..95bf72685d 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeList.yml @@ -6,7 +6,6 @@ command: 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 c5061edaf3..9ffbc57379 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeList2.yml @@ -6,7 +6,6 @@ command: 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 f92c98da73..6995b91e3b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeMap.yml @@ -6,7 +6,6 @@ command: 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 fe8ead9bf7..4057d8d7c9 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeMap2.yml @@ -6,7 +6,6 @@ command: 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 3ce55bf46b..671c043078 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeName.yml @@ -6,7 +6,6 @@ command: 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 152841e7f0..70d13c5c86 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeName2.yml @@ -6,7 +6,6 @@ command: 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 12d260ee0b..3bec48427a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeRegex.yml @@ -6,7 +6,6 @@ command: 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 7a323b8be1..f0d631f4a8 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeState.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: containingScope, scopeType: statement} - extraArgs: [] initialState: documentContents: | diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml index 33f274d0a0..002ae27594 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeString.yml @@ -6,7 +6,6 @@ command: 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 ef55e984dd..357160bfb7 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeType.yml @@ -6,7 +6,6 @@ command: 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 08e9aa95fd..f3e245240a 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeType2.yml @@ -6,7 +6,6 @@ command: 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 1be2e81ee0..c510fc8b74 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue.yml @@ -6,7 +6,6 @@ command: 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 0ca7a9545b..0e0eb5fd0c 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue2.yml @@ -6,7 +6,6 @@ command: 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 51f7f2c226..5adb150572 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue3.yml @@ -6,7 +6,6 @@ command: 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 b46d9d424b..080f00603b 100644 --- a/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml +++ b/src/test/suite/fixtures/recorded/languages/typescript/takeValue4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: containingScope, scopeType: value, includeSiblings: false} - extraArgs: [] initialState: documentContents: |- function foo() { diff --git a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml index eef6f9bfd4..5453ffd5cd 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLF.yml @@ -6,7 +6,6 @@ command: 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 bc5ff3c8ef..17f9c403f4 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml @@ -6,7 +6,6 @@ command: 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 22ee5cf3a1..cfe0ce99db 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/dropVestLF.yml @@ -6,7 +6,6 @@ command: 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 e6447e49cc..023818c8ed 100644 --- a/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml +++ b/src/test/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml @@ -6,7 +6,6 @@ command: 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 999686f24e..eee72b690c 100644 --- a/src/test/suite/fixtures/recorded/marks/takeDownOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeDownOne.yml @@ -10,7 +10,6 @@ command: 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 2bd26eb0ca..c1cc5dd608 100644 --- a/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml +++ b/src/test/suite/fixtures/recorded/marks/takeDownOnePastThree.yml @@ -10,7 +10,6 @@ command: 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 811a5e4897..33c6661549 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowFive.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowFive.yml @@ -10,7 +10,6 @@ command: 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 9481e8621e..70f04d7fb5 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowFour.yml @@ -10,7 +10,6 @@ command: 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 22aab37794..d0534e3245 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowOne.yml @@ -10,7 +10,6 @@ command: 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 572697a16a..9c6d9e69d1 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml @@ -10,7 +10,6 @@ command: 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 212746f234..41cb8780ec 100644 --- a/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml @@ -10,7 +10,6 @@ command: 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 1014db7a40..43ad9060af 100644 --- a/src/test/suite/fixtures/recorded/marks/takeSource.yml +++ b/src/test/suite/fixtures/recorded/marks/takeSource.yml @@ -6,7 +6,6 @@ command: 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 58f216b682..aa2baaf21c 100644 --- a/src/test/suite/fixtures/recorded/marks/takeThat.yml +++ b/src/test/suite/fixtures/recorded/marks/takeThat.yml @@ -6,7 +6,6 @@ command: 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 dc21d2390a..8348c8763e 100644 --- a/src/test/suite/fixtures/recorded/marks/takeThis.yml +++ b/src/test/suite/fixtures/recorded/marks/takeThis.yml @@ -6,7 +6,6 @@ command: 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 77c64f6e20..b124241e85 100644 --- a/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml +++ b/src/test/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml @@ -10,7 +10,6 @@ command: 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 69e12b09b5..a1b96d42ae 100644 --- a/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml +++ b/src/test/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml @@ -10,7 +10,6 @@ command: 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 8dc7cadd12..cfdd988bfe 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterBlockVest.yml @@ -8,7 +8,6 @@ command: 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 2477134ac1..56e681336d 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterHarp.yml @@ -7,7 +7,6 @@ command: - 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 dcee2af6dd..782e48556d 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterLineVest.yml @@ -8,7 +8,6 @@ command: 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 2a16e69826..ca89626b92 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterLook.yml @@ -7,7 +7,6 @@ command: - 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 48bd029ffc..d199f88cce 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAfterVest.yml @@ -7,7 +7,6 @@ command: - 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 539caa6949..4f4c35bc45 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckAir.yml @@ -6,7 +6,6 @@ command: 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 eb26bcc412..21effed70c 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeAir.yml @@ -7,7 +7,6 @@ command: - 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 4d049d015a..31d34664c0 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeBlockAir.yml @@ -8,7 +8,6 @@ command: 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 1b6a501eda..77483adff0 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeEach.yml @@ -7,7 +7,6 @@ command: - 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 bad4309d55..3b8427314e 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeHarp.yml @@ -7,7 +7,6 @@ command: - 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 ba8e05ff42..28d96d84d3 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml @@ -8,7 +8,6 @@ command: 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 4136b7e967..66a1def52e 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckBeforeVest.yml @@ -7,7 +7,6 @@ command: - 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 fb85322269..005c07a9f3 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastAfterLook.yml @@ -12,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 93d8528f50..e9940b52ad 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastBeforeTrap.yml @@ -12,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 7789e426ef..2aa194fa69 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml @@ -9,7 +9,6 @@ command: 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 4f74c0d8cc..7effdfdc01 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml @@ -13,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 5f26892a16..1bf8a8c856 100644 --- a/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml +++ b/src/test/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml @@ -13,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/selectionTypes/bringAirToAfterColumnBatPastFine.yml b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToAfterColumnBatPastFine.yml index c9c8a8d8ce..e8cfb841f3 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToAfterColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToAfterColumnBatPastFine.yml @@ -17,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 7ac33e6d01..c572635ce5 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToBeforeColumnBatPastFine.yml @@ -17,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 626ec852f8..ccc1632363 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToColumnBatPastFine.yml @@ -16,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 4ca7bd6ce3..2146a254dd 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToEndOfColumnBatPastFine.yml @@ -18,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 ec89741d8c..5ac8f7bc52 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/bringAirToStartOfColumnBatPastFine.yml @@ -18,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 4f4a047218..fd8f46eb1d 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir.yml @@ -7,7 +7,6 @@ command: - 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 6fd7dac6fe..ca5e33cefd 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockAir2.yml @@ -7,7 +7,6 @@ command: - 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 a41768d859..34c5915180 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckBlockVest.yml @@ -7,7 +7,6 @@ command: - 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 895c4ef1c5..2391dd90b4 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckFile.yml @@ -5,7 +5,6 @@ command: 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 712167ba72..e0b02eb679 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml @@ -7,7 +7,6 @@ command: - 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 603697f483..395d3ca9e8 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml @@ -7,7 +7,6 @@ command: - 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 343ae3f59b..f0c85eff24 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml @@ -7,7 +7,6 @@ command: - 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 c037ba3e48..b86c6b5711 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/drinkCell.yml @@ -5,7 +5,6 @@ command: 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 46e91d2ca1..bc152f2168 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml @@ -7,7 +7,6 @@ command: - 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 88296646c1..50e59e9d65 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/postColumnWhaleUntilEach.yml @@ -14,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 54c9f7a484..4a4c3f5252 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/pourCell.yml @@ -5,7 +5,6 @@ command: 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 3ed998e113..e034cdd54d 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/pourCellEach.yml @@ -7,7 +7,6 @@ command: - 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 a696801b08..481ed99210 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeBlockAir.yml @@ -7,7 +7,6 @@ command: - 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 cae3fe34b9..6d4a34d8f8 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnAirPastEach.yml @@ -14,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 512268ff84..bc3612ee2d 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnLookPastAir.yml @@ -14,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 c8d3318616..fe93e6e5a8 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnUntilEach.yml @@ -11,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 d124810d25..28f8fcedda 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeColumnWhaleBetweenRam.yml @@ -14,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 83d4ea60c9..7d546f6ee1 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeFile.yml @@ -5,7 +5,6 @@ command: 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 74cd00d5c2..94b8e4c8f7 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeLineVest.yml @@ -7,7 +7,6 @@ command: - 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 89008c8122..9cf3633699 100644 --- a/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml +++ b/src/test/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml @@ -7,7 +7,6 @@ command: - 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 bd81b885dc..5e668b5648 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml @@ -7,7 +7,6 @@ command: - 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 960c87f2e4..c4226226c2 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml @@ -7,7 +7,6 @@ command: - 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 99a6695bd9..08acf54a9e 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml @@ -7,7 +7,6 @@ command: - 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 c167028b4f..97e76a9089 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml @@ -7,7 +7,6 @@ command: - 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 c43582f239..4b3c750ada 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml @@ -7,7 +7,6 @@ command: - 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 57883afcf2..14e1d88e43 100644 --- a/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml @@ -7,7 +7,6 @@ command: - 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 784d624653..51e9cefef1 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml @@ -7,7 +7,6 @@ command: - 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 e6049a975f..9791efc730 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml @@ -7,7 +7,6 @@ command: - 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 18e87df9b2..dbd5ff2094 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearLastCharVest.yml @@ -7,7 +7,6 @@ command: - 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 e8e5fe21fb..02a980c88d 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearLastWordVest.yml @@ -7,7 +7,6 @@ command: - 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 bcec60b81b..88ffef0c7f 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml @@ -7,7 +7,6 @@ command: - 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 0845364f84..94f88819aa 100644 --- a/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml +++ b/src/test/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml @@ -7,7 +7,6 @@ command: - 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 c261ef7ccf..c98a1a0d4a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar.yml @@ -7,7 +7,6 @@ command: - 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 d9a8270175..3608da06c5 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar2.yml @@ -7,7 +7,6 @@ command: - 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 7f0aa2e943..36bfd1664d 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar3.yml @@ -7,7 +7,6 @@ command: - 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 d72ff46554..325f42ced8 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar4.yml @@ -7,7 +7,6 @@ command: - 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 6bbb5784d6..300237926a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstChar5.yml @@ -7,7 +7,6 @@ command: - 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 16fa65035a..121dfdcd97 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml @@ -8,7 +8,6 @@ command: 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 ae253ef407..178145922e 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml @@ -8,7 +8,6 @@ command: 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 df84f4cb31..b54938138a 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml @@ -8,7 +8,6 @@ command: 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 b899884270..77adc861cd 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml @@ -8,7 +8,6 @@ command: 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 4cbda117c3..ebebfff3d7 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml @@ -8,7 +8,6 @@ command: 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 0079325957..5c95a51454 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeFirstWord.yml @@ -7,7 +7,6 @@ command: - 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 084c6f315a..4c47bd5c43 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml @@ -8,7 +8,6 @@ command: 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 a4bd164239..31ba144744 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml @@ -8,7 +8,6 @@ command: 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 06ec3c7ca7..286a3cc17b 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml @@ -8,7 +8,6 @@ command: 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 2f92830bca..9df1a90333 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml @@ -8,7 +8,6 @@ command: 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 5c7b2fcb6c..76a8e224e5 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastEndOfToken.yml @@ -13,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 3f0cb5719f..2a97455876 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml @@ -17,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 7969421561..dbe470070d 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeSecondWord.yml @@ -7,7 +7,6 @@ command: - 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 8226e26464..c8a02359c1 100644 --- a/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml +++ b/src/test/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml @@ -8,7 +8,6 @@ command: 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 219b982822..74cd7901d3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair.yml @@ -6,7 +6,6 @@ command: 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 1ca8be428a..8dc1b6131a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml @@ -6,7 +6,6 @@ command: 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 ba39124228..e15ca9f8f9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml @@ -6,7 +6,6 @@ command: 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 fde4f135a4..5228cd5c60 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml @@ -6,7 +6,6 @@ command: 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 9a1b12b841..ceefcf847a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml @@ -6,7 +6,6 @@ command: 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 05a509767c..3882b1c6fc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml @@ -6,7 +6,6 @@ command: 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 2390b7e714..0fc3870282 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml @@ -6,7 +6,6 @@ command: 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 64efc3f3cc..25b9de2896 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml @@ -6,7 +6,6 @@ command: 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 20008d79f1..aac4c106f7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml @@ -6,7 +6,6 @@ command: 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 76cf4481a6..a3e6ff0276 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml @@ -6,7 +6,6 @@ command: 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 983f38dbe5..ed0489bf71 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml @@ -6,7 +6,6 @@ command: 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 4246b1c059..3a1428066c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml @@ -6,7 +6,6 @@ command: 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 9eff5e94b7..b9bc61550d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml @@ -6,7 +6,6 @@ command: 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 35f43ee61c..79a1eaedb4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml @@ -6,7 +6,6 @@ command: 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 978d5ef7a6..14b96bc3b6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml @@ -6,7 +6,6 @@ command: 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 b2891e1998..81eb2ab4d2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml @@ -6,7 +6,6 @@ command: 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 a4ed3d3614..3378ce85a1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml @@ -6,7 +6,6 @@ command: 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 82b99eee76..94c442b808 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml @@ -6,7 +6,6 @@ command: 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 231f59b45a..178eb1340e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml @@ -6,7 +6,6 @@ command: 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 42a648677d..28b9301093 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml @@ -6,7 +6,6 @@ command: 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 117c8b8d98..1d41e94deb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml @@ -6,7 +6,6 @@ command: 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 02ce9605ab..475e539bce 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml @@ -6,7 +6,6 @@ command: 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 a531f09a0b..105850b498 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml @@ -6,7 +6,6 @@ command: 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 47e02452a9..9451491234 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml @@ -6,7 +6,6 @@ command: 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 1b69092c76..33156b20b0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml @@ -6,7 +6,6 @@ command: 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 97d7d9d123..daacdd38c7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml @@ -6,7 +6,6 @@ command: 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 3767bc8dfa..c3ca4de4b9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml @@ -6,7 +6,6 @@ command: 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 719e10dbcb..6864acbf58 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml @@ -6,7 +6,6 @@ command: 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 040b17c2be..419284ce27 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml @@ -6,7 +6,6 @@ command: 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 a7f5bb20dc..bd5048a23c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml @@ -6,7 +6,6 @@ command: 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 ddb4d1accc..3989d85ccf 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml @@ -6,7 +6,6 @@ command: 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 a311afc34a..0415c3db2f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml @@ -6,7 +6,6 @@ command: 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 d241bef436..5dab98ec9d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml @@ -6,7 +6,6 @@ command: 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 1ed77f5f91..18736dfddf 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml @@ -6,7 +6,6 @@ command: 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 06fdaa1680..e87eb08adc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml @@ -6,7 +6,6 @@ command: 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 2a033a9a7d..dc9495b402 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml @@ -6,7 +6,6 @@ command: 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 1a7bd04941..e00b32da66 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml @@ -6,7 +6,6 @@ command: 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 07757383da..cb538873ca 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml @@ -6,7 +6,6 @@ command: 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 98b9bd8e0f..532ba41a61 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml @@ -6,7 +6,6 @@ command: 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 579eff765d..c034896041 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching9.yml @@ -6,7 +6,6 @@ command: 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 7e0678e8fc..3d8b4d3f27 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml @@ -6,7 +6,6 @@ command: 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 3dbf30c2a2..d12afdf369 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml @@ -6,7 +6,6 @@ command: 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 01da56091e..3d12731dc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml @@ -6,7 +6,6 @@ command: 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 01da56091e..3d12731dc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml @@ -6,7 +6,6 @@ command: 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 3c1c28780b..c47bd39b9c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml @@ -6,7 +6,6 @@ command: 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 7468c96c62..470759effa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml @@ -6,7 +6,6 @@ command: 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 216a0e2f1a..4ae35f1cc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml @@ -6,7 +6,6 @@ command: 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 d00af02bf5..75e9584b3e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml @@ -6,7 +6,6 @@ command: 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 9b92c49d90..4992666f15 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml @@ -6,7 +6,6 @@ command: 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 a3bcb0904c..4459970cd5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml @@ -6,7 +6,6 @@ command: 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 85c9db085b..28ff5ac6fe 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml @@ -6,7 +6,6 @@ command: 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 c331e50a85..7e6155f596 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml @@ -6,7 +6,6 @@ command: 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 06067df267..3b051e3394 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml @@ -6,7 +6,6 @@ command: 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 b021f36b60..a7944a6486 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml @@ -6,7 +6,6 @@ command: 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 6bf4c3cd6b..102d978f01 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml @@ -6,7 +6,6 @@ command: 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 b6a8367ad6..967566c395 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml @@ -6,7 +6,6 @@ command: 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 4d034a50ec..5db0dc09bb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml @@ -6,7 +6,6 @@ command: 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 e062277071..9b13810ccc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml @@ -6,7 +6,6 @@ command: 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 b67de5c084..585e537b01 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml @@ -6,7 +6,6 @@ command: 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 7bf2eee123..3b50bbd2d7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml @@ -6,7 +6,6 @@ command: 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 8f274ad26d..beed540e54 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml @@ -6,7 +6,6 @@ command: 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 aa78fe6a55..dfd6bac5e1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml @@ -6,7 +6,6 @@ command: 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 799d697bdd..90971b9532 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml @@ -6,7 +6,6 @@ command: 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 95f74923e4..a51cec4417 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml @@ -6,7 +6,6 @@ command: 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 7a149986e5..e20bcd1f26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml @@ -6,7 +6,6 @@ command: 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 ee376f45e3..4fa234d260 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml @@ -6,7 +6,6 @@ command: 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 217367926a..a26d6ddf65 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml @@ -6,7 +6,6 @@ command: 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 fc3320d7ef..4235aea7d3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml @@ -6,7 +6,6 @@ command: 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 e747443537..72983c5c6b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml @@ -6,7 +6,6 @@ command: 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 0ef594fa4d..0ac33e89ad 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml @@ -6,7 +6,6 @@ command: 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 7a50c17d5a..3e481fe26c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml @@ -6,7 +6,6 @@ command: 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 7656c814a1..dea5e88a34 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml @@ -6,7 +6,6 @@ command: 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 f243c29ae6..85bb238a42 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml @@ -6,7 +6,6 @@ command: 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 934f6c2733..4fa7f40258 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml @@ -6,7 +6,6 @@ command: 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 7290ee946c..8f2c074cc2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml @@ -6,7 +6,6 @@ command: 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 07d39e8403..aa105c09ab 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml @@ -6,7 +6,6 @@ command: 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 5c930fae0d..66585aee9b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml @@ -6,7 +6,6 @@ command: 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 4d23591949..23bc074385 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml @@ -6,7 +6,6 @@ command: 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 9e1cb370d5..fc5a66f7ec 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml @@ -6,7 +6,6 @@ command: 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 5c034454bc..33a029c4d0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml @@ -6,7 +6,6 @@ command: 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 2f495698c3..1c93d43ea4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml @@ -6,7 +6,6 @@ command: 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 cdad55411c..2e4fab1066 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml @@ -6,7 +6,6 @@ command: 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 1a3ea052e2..f3624cc024 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml @@ -6,7 +6,6 @@ command: 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 7f7b8ac6ff..ad75c768a0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml @@ -6,7 +6,6 @@ command: 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 766d2de2cc..1e7177a311 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml @@ -6,7 +6,6 @@ command: 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 c3237c902f..545ff49f29 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml @@ -6,7 +6,6 @@ command: 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 d37ea67eba..ecd1698bca 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml @@ -6,7 +6,6 @@ command: 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 0f64d38c54..10a670342c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml @@ -6,7 +6,6 @@ command: 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 f9769eab4f..37438c359a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml @@ -6,7 +6,6 @@ command: 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 94cf095ddb..489400aa09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml @@ -6,7 +6,6 @@ command: 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 214798e956..6a7847711d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml @@ -6,7 +6,6 @@ command: 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 f6e51e7320..1203ed00e4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml @@ -6,7 +6,6 @@ command: 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 f67bd2d305..baa9948079 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml @@ -6,7 +6,6 @@ command: 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 76f8b6e08a..55e2406151 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml @@ -6,7 +6,6 @@ command: 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 c89a62b132..b06df81802 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml @@ -6,7 +6,6 @@ command: 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 0d58fa8153..d995208314 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml @@ -6,7 +6,6 @@ command: 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 5a184fbad5..20f01698dc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml @@ -6,7 +6,6 @@ command: 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 4997789955..5188ff14e6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml @@ -6,7 +6,6 @@ command: 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 ef48aef177..7376c38e68 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml @@ -6,7 +6,6 @@ command: 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 4dc13ddefb..d06333b514 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml @@ -6,7 +6,6 @@ command: 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 0dece6b84c..77fc38558f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml @@ -6,7 +6,6 @@ command: 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 323dd34f71..52d6403b99 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml @@ -6,7 +6,6 @@ command: 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 e96b6359a4..d44c1b6687 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml @@ -6,7 +6,6 @@ command: 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 9932f50779..7a170ecbdb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml @@ -6,7 +6,6 @@ command: 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 c88bdd2a23..afcd8a2173 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml @@ -6,7 +6,6 @@ command: 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 b63c37408e..c7127fa92c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml @@ -6,7 +6,6 @@ command: 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 afce043c56..8b08e749e1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml @@ -6,7 +6,6 @@ command: 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 eacb5aa15a..a4865618fd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml @@ -6,7 +6,6 @@ command: 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 0cc24f73b8..9064aa2745 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml @@ -6,7 +6,6 @@ command: 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 80b1ac1e6b..1d55976c3a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml @@ -6,7 +6,6 @@ command: 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 dda4e83d55..df7ff4f261 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml @@ -6,7 +6,6 @@ command: 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 c4240a5a71..93b368dd8f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml @@ -6,7 +6,6 @@ command: 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 56492f7e30..ba95ab6d97 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml @@ -6,7 +6,6 @@ command: 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 02dade3dbf..3cc179f11c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml @@ -6,7 +6,6 @@ command: 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 de92f597a7..4a1a9f1d26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml @@ -7,7 +7,6 @@ command: - 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 35c6f15d8b..da5e3b8d1f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml @@ -7,7 +7,6 @@ command: - 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 6859f4a11c..f46b174aac 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml @@ -6,7 +6,6 @@ command: 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 2ba01b6cc1..c0eddc0c2c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml @@ -6,7 +6,6 @@ command: 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 c7c837e653..4d37c4b716 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml @@ -6,7 +6,6 @@ command: 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 7d3a390d1f..1f0ddcd6f2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml @@ -6,7 +6,6 @@ command: 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 9b84fdfa36..42ef759958 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml @@ -6,7 +6,6 @@ command: 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 5970b22b99..a95ee19e62 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml @@ -6,7 +6,6 @@ command: 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 c6ea27caba..918ba60b33 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml @@ -6,7 +6,6 @@ command: 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 70c482bbcd..97b15a2052 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml @@ -7,8 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} - extraArgs: [] - usePrePhraseSnapshot: true 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 e2ebd0f64f..ca60437bd7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml @@ -6,7 +6,6 @@ command: 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 13cc14895b..28e51421d3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] 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 80f398695c..bed3a51292 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml @@ -6,7 +6,6 @@ command: 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/takeOutside.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml index 261b54b62a..6df4e66336 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 1b27d8dc23..a983169584 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml @@ -6,7 +6,6 @@ command: 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 42274bdb24..fd21798bc0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml @@ -6,7 +6,6 @@ command: 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 fb6f26cc55..fb650a9470 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml @@ -6,7 +6,6 @@ command: 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 2c973ee88b..c7618d48be 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml @@ -6,7 +6,6 @@ command: 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 efb78d9d52..d0466837e9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml @@ -6,7 +6,6 @@ command: 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 7a01b2763b..079a7f83fe 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml @@ -6,7 +6,6 @@ command: 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 813eeca46c..a41e3cd8fb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml @@ -6,7 +6,6 @@ command: 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 ce4e73c1a1..d695c935b7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml @@ -6,7 +6,6 @@ command: 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 29cad3cc46..132b5626af 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml @@ -6,7 +6,6 @@ command: 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 ca38b19e26..0cabbd18bd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 7f3f8788a7..335c1f5c49 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml @@ -6,7 +6,6 @@ command: 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 9ad16505ef..9691fa4683 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml @@ -6,7 +6,6 @@ command: 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 31cbc383c8..488a2d80e7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml @@ -6,7 +6,6 @@ command: 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 1b9434a2d9..213326d142 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml @@ -6,7 +6,6 @@ command: 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 29c52279d0..401181bb6c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml @@ -6,7 +6,6 @@ command: 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 42a4be03d7..451fa59f34 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml @@ -6,7 +6,6 @@ command: 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 708411f498..d6131e01a1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml @@ -6,7 +6,6 @@ command: 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 7efa136408..f07ef77524 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 2c87e6a7f8..56540cfc1e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 532154ee61..8fc3a0dbe7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 9afa359832..bb58ce3e09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 bbc4dba9ec..4746860dd1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 675af9bf4f..2b928f4846 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 58f64a80de..6660b0198a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 b1c8b3b8f1..e14c271b0a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] 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 0c651ba20d..f9e53967aa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: ']'} - extraArgs: [] 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 e274ad55c7..a0666f2473 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairDouble.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - extraArgs: [] 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 c66b5956a6..3ca43746f8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] 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 196fc3bfe4..41102831e0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takePairRound2.yml @@ -6,7 +6,6 @@ command: 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/takeQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml index a5ad0af21b..14f559a94d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 32e66d9de0..f103092de5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 e5bc54c76c..b179f57441 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 7592150b03..8b726646dd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 6f0111903d..0d7e55fc87 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 3ed7f101d0..bc7664ab36 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 5ed9695880..023e64fc1e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 1dff47acd4..4f4950a337 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 952a8d44c3..33767f31c9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 9f4b597e73..22f78e5bfe 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 348cf99537..54527cc6c5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 db50126d97..9a137d39ac 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 4a0aaaed8f..0bcb255e6e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 8a814f0ba0..37312750cd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 0d60205416..7d01e4e4f3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 7438407822..56ed9bddfd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 5163f48950..bcb1755059 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 e9788b0895..153515030e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 3c6aa927e2..071c32b10a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 afd0a241cd..818a0cc70a 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 bdf45e1c4f..08011258df 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 2e487eb29d..0936e33a1f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 4eedd75038..4e611c9846 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 7b32e3082a..76a2f3a3ed 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 77db3e8fa7..efec6d8b39 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 45cfcbadc6..57b54951d7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 f01169f764..d938faf170 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 e101cb537f..1a852759ed 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 c7b52cd0c6..0213d51f31 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 0e319fd086..2c908271c2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] 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 7a33e51cee..716a9cdbe5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: )} - extraArgs: [] 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 45948147ab..e6aee441a3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets} - extraArgs: [] 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 4744544a8a..ab0e86d8a3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml @@ -6,7 +6,6 @@ command: 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 1659c44b67..d0faf26a1e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml @@ -6,7 +6,6 @@ command: 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 483c61f5d2..07e8c0ad27 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml @@ -6,7 +6,6 @@ command: 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 19e70f4d76..3175ba91ef 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml @@ -6,7 +6,6 @@ command: 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 fe4976b46b..32e141a379 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml @@ -7,8 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: blue, character: '"'} - extraArgs: [] - usePrePhraseSnapshot: true 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 37bc5ef8aa..52a34508c0 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml @@ -6,7 +6,6 @@ command: 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 83b47dea3b..353e06bd09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml @@ -6,7 +6,6 @@ command: 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 3ab9ab29b3..77e8de2243 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml @@ -6,7 +6,6 @@ command: 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 9537997829..0e6a5ca7f6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml @@ -6,7 +6,6 @@ command: 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 b910c68af1..5455441b7f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml @@ -6,7 +6,6 @@ command: 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 5f10e0ea60..27e873c9d1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml @@ -6,7 +6,6 @@ command: 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 e1d76e258f..0f5b296b13 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml @@ -6,7 +6,6 @@ command: 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 4693cd2862..2d6eb2d8fd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml @@ -6,7 +6,6 @@ command: 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 a628d35168..ccd4fe3e22 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml @@ -6,7 +6,6 @@ command: 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 4fd7b79bfa..e610274263 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml @@ -6,7 +6,6 @@ command: 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 05c1e7e950..2273802881 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml @@ -6,7 +6,6 @@ command: 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 1b9f96c62d..dfc3eaa164 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml @@ -6,7 +6,6 @@ command: 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 d711b2ccce..5b24523f5b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml @@ -6,7 +6,6 @@ command: 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 62f230d00f..deb455624c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml @@ -6,7 +6,6 @@ command: 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 6a4dc7e6f3..e3a39b8d10 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml @@ -6,7 +6,6 @@ command: 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 521d259cf2..d2b4ebf768 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml @@ -6,7 +6,6 @@ command: 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 9f29e5a8e9..4c4b8c9d3c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml @@ -6,7 +6,6 @@ command: 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 8a921052af..e099de8e3c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] 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 7d84cbe525..bd204386e9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] 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 f64a4ffad8..a1adfba200 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] 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 ba2316199d..fa31fc0101 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] 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 da842d9518..a14e26c920 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] 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 50df1b6de2..b0fb0e1121 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes} - extraArgs: [] 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 ad5902afd0..35d5905a38 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly} - extraArgs: [] 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 6829a9be50..81bb24536e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml @@ -6,7 +6,6 @@ command: 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/takeLeftQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml index e069a023f1..b6a9fd3344 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml @@ -6,7 +6,6 @@ command: 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 4a20949a86..d60fb7d4df 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml @@ -6,7 +6,6 @@ command: 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 f1f978a3e7..bc1b9233fd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml @@ -6,7 +6,6 @@ command: 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 10b1dd6bfc..998b3b570b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml @@ -6,7 +6,6 @@ command: 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 f493e963d4..7bd2de1948 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml @@ -6,7 +6,6 @@ command: 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 2f597632b3..e2f0a5adc1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml @@ -6,7 +6,6 @@ command: 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 e4a7553369..7f0e7cb02b 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml @@ -6,7 +6,6 @@ command: 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 1e51825644..58bc732bbd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 9d02783d36..90cbe8a285 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 b485cc1862..4f2f987e37 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml @@ -6,7 +6,6 @@ command: 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 2d21d9b669..d9314b09ae 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml @@ -6,7 +6,6 @@ command: 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 02c74dd164..7f0db26e26 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml @@ -6,7 +6,6 @@ command: 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 0c5717ea15..bb4faae285 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml @@ -6,7 +6,6 @@ command: 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 b7bdc97723..79693e9769 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml @@ -6,7 +6,6 @@ command: 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 dc96b4b8d4..82e0994f96 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml @@ -6,7 +6,6 @@ command: 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 c0d851860b..890843ad43 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml @@ -6,7 +6,6 @@ command: 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 6aef743c70..af44b1919e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml @@ -6,7 +6,6 @@ command: 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 e4dda841e1..efecdc8ed7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml @@ -6,7 +6,6 @@ command: 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 a8e392766a..e8d020ba41 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 26063dc6e0..c475ca7bdb 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml @@ -6,7 +6,6 @@ command: 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 aacab0f35e..4571ec40f3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml @@ -6,7 +6,6 @@ command: 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 2db90bd79e..0120f21edd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml @@ -6,7 +6,6 @@ command: 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 171ac9bb8d..e5f7235df6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml @@ -6,7 +6,6 @@ command: 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 584ee0aa7a..cdeb182949 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml @@ -6,7 +6,6 @@ command: 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 67ddb81df4..4191685a72 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml @@ -6,7 +6,6 @@ command: 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 a8de3d2353..6acf2f819f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml @@ -6,7 +6,6 @@ command: 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 694a084d08..4e6f1e4e70 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml @@ -6,7 +6,6 @@ command: 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 2c4aaa23a5..155b48ae2d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 d8717f1e09..9dea1900fa 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 39f061143e..2c20a1471e 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 1d20e156eb..75a1acd1ee 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 fce8ed39f7..91d430ce87 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 62c646648e..e179631b08 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 0377d0a64e..2141c9d008 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: any} - extraArgs: [] 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 f0fa68132b..37d8daaac5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml @@ -7,8 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: f} - extraArgs: [] - usePrePhraseSnapshot: true 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 2f59655951..c1d9a5ad09 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] 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 3ed4255b8e..5f172e9364 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: ']'} - extraArgs: [] 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 49d4097e48..bc604ac767 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml @@ -7,8 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any} mark: {type: decoratedSymbol, symbolColor: default, character: u} - extraArgs: [] - usePrePhraseSnapshot: true 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 f8fd856440..8dbb917122 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairDouble.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior} mark: {type: decoratedSymbol, symbolColor: default, character: '"'} - extraArgs: [] 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 85560220c9..f04ac868bd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior} - extraArgs: [] 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 ad74f5cda8..bc2c5d6d41 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takePairRound2.yml @@ -6,7 +6,6 @@ command: 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/takeQuad.yml b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml index 54edb40b65..dff6ec9201 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 cbbdec1e1e..88a051e310 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 2f5709c3f3..86dac68a60 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 778c671ddf..d6b3345294 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 3ddc9743ed..b75613e3dd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 07e6b43e91..ef7c665ad4 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: doubleQuotes} - extraArgs: [] 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 defb14d37f..96441d3f50 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml @@ -6,7 +6,6 @@ command: 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 d103230ec4..3252c6d299 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml @@ -6,7 +6,6 @@ command: 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 739a8e67ce..45c8745b6d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml @@ -6,7 +6,6 @@ command: 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 3cb69ab543..6522e3b5cd 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml @@ -6,7 +6,6 @@ command: 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 91ad79a091..8502907d6c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml @@ -6,7 +6,6 @@ command: 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 3740a048a5..e2476bcd8f 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml @@ -6,7 +6,6 @@ command: 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 b3183cb1c6..0a61077329 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml @@ -6,7 +6,6 @@ command: 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 1617755b13..c70eee27ae 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 1f43dca1bc..0d1c072b0c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 78091e3cc1..1b79a0b9d9 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 565c3ff25c..5887bffee2 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 89ead8a200..f64db6a130 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 0179eef688..14e7d8d744 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 b0e7dcaee3..a8075ee321 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 6789d215c8..cb60f87c5d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 7cff3a3fe4..5de40ae4b7 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 208ed886eb..e6234c06d1 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 658dcaa23f..d2ae66d467 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 6235e2d081..033190a2e3 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 a18e817c63..2a2d4e7421 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 b068b28b26..b0ec3bcfa8 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 958fcdd497..0cdcee1f58 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 c2c4fd7900..7813a165f6 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 8c2c2575fc..012d454c0d 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 94265382a7..5201f1b5f5 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 18b116e5be..7e4643841c 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 ba364c2c9a..d03bc45c15 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 85768a16af..86df5b3b20 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 44cb18774e..58283aaf73 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 7afd1e1b76..c5dd69c527 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} - extraArgs: [] 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 e5d3595ce6..70df7a4ddc 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: (} - extraArgs: [] 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 26deb730a1..a45d92d480 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml @@ -7,7 +7,6 @@ command: - type: primitive modifier: {type: surroundingPair, delimiter: parentheses} mark: {type: decoratedSymbol, symbolColor: default, character: )} - extraArgs: [] 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 6dd5d95d62..7dfde56606 100644 --- a/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml +++ b/src/test/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive modifier: {type: surroundingPair, delimiter: squareBrackets} - extraArgs: [] 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 2effd062e3..2965bd4c19 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFine.yml @@ -12,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 588f52c505..54fbdc1bcc 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml @@ -11,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 1abd6b94f7..10f6234510 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml @@ -9,7 +9,6 @@ command: - 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 2def22d871..1267f27294 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml @@ -9,7 +9,6 @@ command: - 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 3066f48af8..bce7f981d2 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml @@ -9,7 +9,6 @@ command: - 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 4ce647217c..238de8daa5 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml @@ -10,7 +10,6 @@ command: 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 0630902bad..3b59910134 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml @@ -9,7 +9,6 @@ command: - 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 ce80d6fb21..ceeaa743bd 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml @@ -10,7 +10,6 @@ command: 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 31468ab66b..f4f492b1b6 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml @@ -9,7 +9,6 @@ command: - 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 b127b04516..c5c0db2ff3 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml @@ -10,7 +10,6 @@ command: 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 b048bc80c7..39d5ca41cf 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml @@ -8,7 +8,6 @@ command: 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 736774093b..3add8ef66e 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml @@ -8,7 +8,6 @@ command: 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 40f183ab1c..f121242ed5 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml @@ -8,7 +8,6 @@ command: 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 333237b012..41ed962636 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml @@ -8,7 +8,6 @@ command: 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 9289ff256e..2243819c8f 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml @@ -8,7 +8,6 @@ command: 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 cfe2aad1cf..f5e20372e8 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml @@ -10,7 +10,6 @@ command: 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 1dfd056939..d90bbaef2b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml @@ -19,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 2cdad0f6f5..9f8a97a8c2 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml @@ -19,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 e23bb56ea9..5cfa8c765f 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml @@ -19,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 9fa731968c..823a418e11 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml @@ -10,7 +10,6 @@ command: 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 d0c2dac603..b53df2619e 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhale.yml @@ -12,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 0204443e67..94b44d205b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml @@ -9,7 +9,6 @@ command: - 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 fc7ffe9427..e96ae1b561 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml @@ -9,7 +9,6 @@ command: - 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 fc7ffe9427..e96ae1b561 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml @@ -9,7 +9,6 @@ command: - 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 1f45dc1079..dbd2c11525 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml @@ -9,7 +9,6 @@ command: - 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 85eae5eeed..6447d9784f 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml @@ -10,7 +10,6 @@ command: 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 c9a331254d..b8ee10a71c 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml @@ -8,7 +8,6 @@ command: 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 64d8b6b461..b446deceb9 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml @@ -8,7 +8,6 @@ command: 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 5d4d11ef31..de36bdade4 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml @@ -7,7 +7,6 @@ command: - 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 d10ead3eec..cc09ce9ea5 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml @@ -7,7 +7,6 @@ command: - 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 ef096efea8..105608b75a 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml @@ -8,7 +8,6 @@ command: 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 c2623c6f4a..41592e51b3 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml @@ -17,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 271a463c8b..9d2b6dffe3 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml @@ -7,7 +7,6 @@ command: - 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 e2725a0dd2..f364a01d35 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml @@ -17,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 7a24406abc..9ed8cd4a6b 100644 --- a/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml +++ b/src/test/suite/fixtures/recorded/updateSelections/commentTrap.yml @@ -6,7 +6,6 @@ command: targets: - type: primitive mark: {type: decoratedSymbol, symbolColor: default, character: t} - extraArgs: [] initialState: documentContents: |- 'hello' From f98ae49c3ac8c6f32702c79965f813567238f9f8 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Fri, 3 Dec 2021 17:40:33 +0000 Subject: [PATCH 48/54] Cleanup test recording --- src/core/commandRunner/types.ts | 2 +- src/scripts/transformRecordedTests.ts | 16 ++++++---------- src/testUtil/TestCase.ts | 5 ++++- src/testUtil/cleanUpTestCaseCommand.ts | 17 +++++++++++++++++ 4 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 src/testUtil/cleanUpTestCaseCommand.ts diff --git a/src/core/commandRunner/types.ts b/src/core/commandRunner/types.ts index 34c13cf1ac..ccd11c0910 100644 --- a/src/core/commandRunner/types.ts +++ b/src/core/commandRunner/types.ts @@ -14,7 +14,7 @@ interface CommandArgumentV1 extends CommandArgumentV0V1 { interface CommandArgumentV0 extends CommandArgumentV0V1 { version: 0; - usePrePhraseSnapshot: false; + usePrePhraseSnapshot?: false; } interface CommandArgumentV0V1 { diff --git a/src/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts index 050a1b0f2b..8781fcc3d7 100644 --- a/src/scripts/transformRecordedTests.ts +++ b/src/scripts/transformRecordedTests.ts @@ -11,6 +11,8 @@ import { transformPartialPrimitiveTargets } from "../util/getPrimitiveTargets"; import { DelimiterInclusion, PartialPrimitiveTarget } from "../typings/Types"; import { mkdir, rename } from "fs/promises"; import { canonicalizeAndValidateCommand } from "../util/canonicalizeAndValidateCommand"; +import { flowRight } from "lodash"; +import { cleanUpTestCaseCommand } from "../testUtil/cleanUpTestCaseCommand"; /** * The transformation to run on all recorded test fixtures. Change this @@ -68,16 +70,10 @@ function identity(fixture: TestCaseFixture) { } function canonicalizeCommand(fixture: TestCaseFixture) { - fixture.command = canonicalizeAndValidateCommand(fixture.command); - fixture.command.usePrePhraseSnapshot = undefined; - - const extraArgs = fixture.command.extraArgs; - fixture.command.extraArgs = - extraArgs == null - ? undefined - : extraArgs.length === 0 - ? undefined - : extraArgs; + fixture.command = flowRight( + canonicalizeAndValidateCommand, + cleanUpTestCaseCommand + )(fixture.command); return fixture; } diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts index e053ad91da..7193c61fbc 100644 --- a/src/testUtil/TestCase.ts +++ b/src/testUtil/TestCase.ts @@ -12,6 +12,7 @@ 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 = CommandArgument; @@ -47,13 +48,15 @@ export class TestCase { targetKeys: string[]; private _awaitingFinalMarkInfo: boolean; marksToCheck?: string[]; + public command: TestCaseCommand; constructor( - public command: TestCaseCommand, + command: TestCaseCommand, private context: TestCaseContext, private isHatTokenMapTest: boolean = false ) { const activeEditor = vscode.window.activeTextEditor!; + this.command = cleanUpTestCaseCommand(command); const { targets } = context; diff --git a/src/testUtil/cleanUpTestCaseCommand.ts b/src/testUtil/cleanUpTestCaseCommand.ts new file mode 100644 index 0000000000..2bde48f5be --- /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 { + extraArgs: + extraArgs == null + ? undefined + : extraArgs.length === 0 + ? undefined + : extraArgs, + ...rest, + }; +} From fbd85317fd7cbc6aa727553b84f95a702e7d1003 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Sat, 4 Dec 2021 18:06:06 +0000 Subject: [PATCH 49/54] Add docs --- CONTRIBUTING.md | 6 +++--- docs/architecture/hat-snapshots.md | 7 +++++++ docs/architecture/hat-token-map-snapshots.png | Bin 0 -> 357887 bytes .../adding-a-new-language.md | 2 +- docs/{ => contributing}/parse-tree-patterns.md | 0 docs/{ => contributing}/test-case-recorder.md | 0 src/core/Decorations.ts | 1 + src/errors.ts | 2 +- 8 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 docs/architecture/hat-snapshots.md create mode 100644 docs/architecture/hat-token-map-snapshots.png rename docs/{ => contributing}/adding-a-new-language.md (99%) rename docs/{ => contributing}/parse-tree-patterns.md (100%) rename docs/{ => contributing}/test-case-recorder.md (100%) 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 0000000000000000000000000000000000000000..c1c808b9bcf0efc06fe116f7e2fd794db4facb27 GIT binary patch literal 357887 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 HF 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 colorEnablement[color]); 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"; } From 3e7577230bac82f46ee9b0d1d058a9f82775b4dc Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Sun, 5 Dec 2021 16:53:11 +0000 Subject: [PATCH 50/54] Fix creating nested recorded test directories --- src/testUtil/TestCaseRecorder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testUtil/TestCaseRecorder.ts b/src/testUtil/TestCaseRecorder.ts index 596df602ad..7aa2723716 100644 --- a/src/testUtil/TestCaseRecorder.ts +++ b/src/testUtil/TestCaseRecorder.ts @@ -154,7 +154,7 @@ export class TestCaseRecorder { ); if (!fs.existsSync(targetDirectory)) { - fs.mkdirSync(targetDirectory); + fs.mkdirSync(targetDirectory, { recursive: true }); } let filename = camelize(testCase.command.spokenForm!); From 30d60bcf0be4617a00899b378612932d53c72ea1 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 6 Dec 2021 16:39:08 +0000 Subject: [PATCH 51/54] Cleanup test case bulk transformer --- docs/contributing/test-case-recorder.md | 19 ++- src/scripts/transformRecordedTests.ts | 122 ------------------ src/scripts/transformRecordedTests/index.ts | 35 +++++ .../transformRecordedTests/moveFile.ts | 27 ++++ .../transformRecordedTests/transformFile.ts | 14 ++ .../transformations/canonicalizeFixture.ts | 20 +++ .../transformations/identity.ts | 5 + .../transformations/reorderFields.ts | 13 ++ .../updateSurroundingPairTest.ts | 35 +++++ .../transformations/upgradeFromVersion0.ts | 32 +++++ src/scripts/transformRecordedTests/types.ts | 5 + 11 files changed, 200 insertions(+), 127 deletions(-) delete mode 100644 src/scripts/transformRecordedTests.ts create mode 100644 src/scripts/transformRecordedTests/index.ts create mode 100644 src/scripts/transformRecordedTests/moveFile.ts create mode 100644 src/scripts/transformRecordedTests/transformFile.ts create mode 100644 src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts create mode 100644 src/scripts/transformRecordedTests/transformations/identity.ts create mode 100644 src/scripts/transformRecordedTests/transformations/reorderFields.ts create mode 100644 src/scripts/transformRecordedTests/transformations/updateSurroundingPairTest.ts create mode 100644 src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts create mode 100644 src/scripts/transformRecordedTests/types.ts diff --git a/docs/contributing/test-case-recorder.md b/docs/contributing/test-case-recorder.md index 6648fd04b0..27d5f293d6 100644 --- a/docs/contributing/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` + +### Canonicalizing fixtures + +To normalize all the test fixtures by upgrading action names and reordering fields, run the command `yarn run compile && node ./out/scripts/transformRecordedTests/index.js canonicalize` + +### 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/src/scripts/transformRecordedTests.ts b/src/scripts/transformRecordedTests.ts deleted file mode 100644 index 8781fcc3d7..0000000000 --- a/src/scripts/transformRecordedTests.ts +++ /dev/null @@ -1,122 +0,0 @@ -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 { transformPartialPrimitiveTargets } from "../util/getPrimitiveTargets"; -import { DelimiterInclusion, PartialPrimitiveTarget } from "../typings/Types"; -import { mkdir, rename } from "fs/promises"; -import { canonicalizeAndValidateCommand } from "../util/canonicalizeAndValidateCommand"; -import { flowRight } from "lodash"; -import { cleanUpTestCaseCommand } from "../testUtil/cleanUpTestCaseCommand"; - -/** - * 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 canonicalizeCommand(fixture: TestCaseFixture) { - fixture.command = flowRight( - canonicalizeAndValidateCommand, - cleanUpTestCaseCommand - )(fixture.command); - - return fixture; -} - -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, - }; -} - -// Leaving an example here in case it's helpful -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; -} - -main(); diff --git a/src/scripts/transformRecordedTests/index.ts b/src/scripts/transformRecordedTests/index.ts new file mode 100644 index 0000000000..c52422a9be --- /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 { canonicalizeFixture } from "./transformations/canonicalizeFixture"; +import { identity } from "./transformations/identity"; +import { transformFile } from "./transformFile"; + +const AVAILABLE_TRANSFORMATIONS: Record = { + canonicalize: canonicalizeFixture, + autoFormat: identity, + custom: updateSurroundingPairTest, +}; + +async function main(transformationName: string | undefined) { + const transformation = + transformationName == null + ? identity + : AVAILABLE_TRANSFORMATIONS[transformationName]; + + if (transformation == null) { + throw 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[0]); 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/canonicalizeFixture.ts b/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts new file mode 100644 index 0000000000..dac6c57669 --- /dev/null +++ b/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts @@ -0,0 +1,20 @@ +import { TestCaseFixture } from "../../../testUtil/TestCase"; +import { canonicalizeAndValidateCommand } from "../../../util/canonicalizeAndValidateCommand"; +import { flowRight } from "lodash"; +import { cleanUpTestCaseCommand } from "../../../testUtil/cleanUpTestCaseCommand"; +import { upgradeFromVersion0 } from "./upgradeFromVersion0"; +import { reorderFields } from "./reorderFields"; + +export const canonicalizeFixture = flowRight( + upgradeFromVersion0, + canonicalizeCommand, + reorderFields +); +function canonicalizeCommand(fixture: TestCaseFixture) { + fixture.command = flowRight( + canonicalizeAndValidateCommand, + cleanUpTestCaseCommand + )(fixture.command); + + return fixture; +} 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/upgradeFromVersion0.ts b/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts new file mode 100644 index 0000000000..2310cfe3ab --- /dev/null +++ b/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts @@ -0,0 +1,32 @@ +import { TestCaseFixture } from "../../../testUtil/TestCase"; +import { transformPartialPrimitiveTargets } from "../../../util/getPrimitiveTargets"; +import { PartialPrimitiveTarget } from "../../../typings/Types"; + +export function upgradeFromVersion0(fixture: TestCaseFixture) { + const { command, spokenForm, ...rest } = fixture as any; + + const { + 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, + 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; From c577831439f1153caccdee429a5a2315e096b612 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 6 Dec 2021 16:48:56 +0000 Subject: [PATCH 52/54] More transform script fixes --- src/scripts/transformRecordedTests/index.ts | 6 +++--- .../transformations/canonicalizeFixture.ts | 7 ++++--- .../transformations/upgradeFromVersion0.ts | 11 ++++++++--- src/testUtil/cleanUpTestCaseCommand.ts | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/scripts/transformRecordedTests/index.ts b/src/scripts/transformRecordedTests/index.ts index c52422a9be..e60323361d 100644 --- a/src/scripts/transformRecordedTests/index.ts +++ b/src/scripts/transformRecordedTests/index.ts @@ -20,16 +20,16 @@ async function main(transformationName: string | undefined) { : AVAILABLE_TRANSFORMATIONS[transformationName]; if (transformation == null) { - throw Error(`Unknown transformation ${transformationName}`); + throw new Error(`Unknown transformation ${transformationName}`); } const directory = path.join( __dirname, - "../../src/test/suite/fixtures/recorded" + "../../../src/test/suite/fixtures/recorded" ); const files = walkFilesSync(directory); files.forEach((file) => transformFile(transformation, file)); } -main(process.argv[0]); +main(process.argv[2]); diff --git a/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts b/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts index dac6c57669..035e245d17 100644 --- a/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts +++ b/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts @@ -1,17 +1,18 @@ import { TestCaseFixture } from "../../../testUtil/TestCase"; import { canonicalizeAndValidateCommand } from "../../../util/canonicalizeAndValidateCommand"; -import { flowRight } from "lodash"; +import { flow } from "lodash"; import { cleanUpTestCaseCommand } from "../../../testUtil/cleanUpTestCaseCommand"; import { upgradeFromVersion0 } from "./upgradeFromVersion0"; import { reorderFields } from "./reorderFields"; -export const canonicalizeFixture = flowRight( +export const canonicalizeFixture = flow( upgradeFromVersion0, canonicalizeCommand, reorderFields ); + function canonicalizeCommand(fixture: TestCaseFixture) { - fixture.command = flowRight( + fixture.command = flow( canonicalizeAndValidateCommand, cleanUpTestCaseCommand )(fixture.command); diff --git a/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts b/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts index 2310cfe3ab..5e878f4a43 100644 --- a/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts +++ b/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts @@ -3,10 +3,15 @@ import { transformPartialPrimitiveTargets } from "../../../util/getPrimitiveTarg import { PartialPrimitiveTarget } from "../../../typings/Types"; export function upgradeFromVersion0(fixture: TestCaseFixture) { - const { command, spokenForm, ...rest } = fixture as any; + const { command, spokenForm: oldSpokenForm, ...rest } = fixture as any; const { - actionName: oldAction, action: newAction, partialTargets: oldTargets, targets: newTargets, extraArgs, + spokenForm: newSpokenForm, + actionName: oldAction, + action: newAction, + partialTargets: oldTargets, + targets: newTargets, + extraArgs, } = command; const targets = transformPartialPrimitiveTargets( @@ -22,7 +27,7 @@ export function upgradeFromVersion0(fixture: TestCaseFixture) { return { command: { version: 1, - spokenForm, + spokenForm: newSpokenForm ?? oldSpokenForm, action: newAction ?? oldAction, targets, extraArgs, diff --git a/src/testUtil/cleanUpTestCaseCommand.ts b/src/testUtil/cleanUpTestCaseCommand.ts index 2bde48f5be..c1822abba2 100644 --- a/src/testUtil/cleanUpTestCaseCommand.ts +++ b/src/testUtil/cleanUpTestCaseCommand.ts @@ -6,12 +6,12 @@ export function cleanUpTestCaseCommand( const { extraArgs, usePrePhraseSnapshot, ...rest } = command; return { + ...rest, extraArgs: extraArgs == null ? undefined : extraArgs.length === 0 ? undefined : extraArgs, - ...rest, }; } From 4b56a1defa3373a7bbc0e13f254a750958cf09ea Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 6 Dec 2021 16:54:09 +0000 Subject: [PATCH 53/54] More transform stuff --- docs/contributing/test-case-recorder.md | 4 ++-- src/scripts/transformRecordedTests/index.ts | 4 ++-- .../{canonicalizeFixture.ts => upgrade.ts} | 8 ++------ 3 files changed, 6 insertions(+), 10 deletions(-) rename src/scripts/transformRecordedTests/transformations/{canonicalizeFixture.ts => upgrade.ts} (75%) diff --git a/docs/contributing/test-case-recorder.md b/docs/contributing/test-case-recorder.md index 27d5f293d6..06f9d5f0f5 100644 --- a/docs/contributing/test-case-recorder.md +++ b/docs/contributing/test-case-recorder.md @@ -60,9 +60,9 @@ and can be run in vscode or via yarn in terminal. To clean up the formatting of all of the yaml test cases, run `yarn run compile && node ./out/scripts/transformRecordedTests/index.js` -### Canonicalizing fixtures +### Upgrading fixtures -To normalize all the test fixtures by upgrading action names and reordering fields, run the command `yarn run compile && node ./out/scripts/transformRecordedTests/index.js canonicalize` +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 diff --git a/src/scripts/transformRecordedTests/index.ts b/src/scripts/transformRecordedTests/index.ts index e60323361d..195f12fb4e 100644 --- a/src/scripts/transformRecordedTests/index.ts +++ b/src/scripts/transformRecordedTests/index.ts @@ -3,12 +3,12 @@ import * as path from "path"; import { walkFilesSync } from "../../testUtil/walkSync"; import { updateSurroundingPairTest } from "./transformations/updateSurroundingPairTest"; import { FixtureTransformation } from "./types"; -import { canonicalizeFixture } from "./transformations/canonicalizeFixture"; +import { upgrade } from "./transformations/upgrade"; import { identity } from "./transformations/identity"; import { transformFile } from "./transformFile"; const AVAILABLE_TRANSFORMATIONS: Record = { - canonicalize: canonicalizeFixture, + upgrade, autoFormat: identity, custom: updateSurroundingPairTest, }; diff --git a/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts b/src/scripts/transformRecordedTests/transformations/upgrade.ts similarity index 75% rename from src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts rename to src/scripts/transformRecordedTests/transformations/upgrade.ts index 035e245d17..b9cb93b2a8 100644 --- a/src/scripts/transformRecordedTests/transformations/canonicalizeFixture.ts +++ b/src/scripts/transformRecordedTests/transformations/upgrade.ts @@ -5,13 +5,9 @@ import { cleanUpTestCaseCommand } from "../../../testUtil/cleanUpTestCaseCommand import { upgradeFromVersion0 } from "./upgradeFromVersion0"; import { reorderFields } from "./reorderFields"; -export const canonicalizeFixture = flow( - upgradeFromVersion0, - canonicalizeCommand, - reorderFields -); +export const upgrade = flow(upgradeFromVersion0, upgradeCommand, reorderFields); -function canonicalizeCommand(fixture: TestCaseFixture) { +function upgradeCommand(fixture: TestCaseFixture) { fixture.command = flow( canonicalizeAndValidateCommand, cleanUpTestCaseCommand From b74cf8d1f87bbb9f2ffa27f301a674048f2852c2 Mon Sep 17 00:00:00 2001 From: Pokey Rule Date: Mon, 6 Dec 2021 17:14:06 +0000 Subject: [PATCH 54/54] Upgrade a test --- .../fixtures/recorded/languages/typescript/takeState2.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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) {

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