Upgrade commands

cursorless-dev · Dec 7, 2023 · ae958d3 · ae958d3
1 parent ef66688
commit ae958d3
Show file tree

Hide file tree

Showing 26 changed files with 151 additions and 120 deletions.
diff --git a/...de-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/bringBlockMade.yml b/...de-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/bringBlockMade.yml
@@ -1,16 +1,17 @@
 languageId: python
 command:
+  version: 6
   spokenForm: bring block made
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
+  action:
+    name: replaceWithTarget
+    source:
+      type: primitive
       modifiers:
         - type: containingScope
           scopeType: {type: paragraph}
-    - {type: primitive, isImplicit: true}
+      mark: {type: decoratedSymbol, symbolColor: default, character: m}
+    destination: {type: implicit}
   usePrePhraseSnapshot: false
-  action: {name: replaceWithTarget}
 initialState:
   documentContents: |+
     from talon import Context, Module

diff --git a/...code-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearCoreSun.yml b/...code-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearCoreSun.yml
@@ -1,16 +1,17 @@
 languageId: python
 command:
+  version: 6
   spokenForm: change inside pair sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
       modifiers:
         - {type: interiorOnly}
         - type: containingScope
           scopeType: {type: surroundingPair, delimiter: any}
+      mark: {type: decoratedSymbol, symbolColor: default, character: s}
   usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/...ode-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearCoreYank.yml b/...ode-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearCoreYank.yml
@@ -1,16 +1,17 @@
 languageId: python
 command:
+  version: 6
   spokenForm: change inside pair yank
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
       modifiers:
         - {type: interiorOnly}
         - type: containingScope
           scopeType: {type: surroundingPair, delimiter: any}
+      mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}
   usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/.../src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearDownScoreAndCap.yml b/.../src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearDownScoreAndCap.yml
@@ -1,16 +1,17 @@
 languageId: python
 command:
+  version: 6
   spokenForm: change underscore and cap
-  version: 2
-  targets:
-    - type: list
+  action:
+    name: clearAndSetSelection
+    target:
+      type: list
       elements:
         - type: primitive
           mark: {type: decoratedSymbol, symbolColor: default, character: _}
         - type: primitive
           mark: {type: decoratedSymbol, symbolColor: default, character: c}
   usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/...-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearRepperLeper.yml b/...-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearRepperLeper.yml
@@ -1,12 +1,13 @@
 languageId: python
 command:
+  version: 6
   spokenForm: change right paren
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: )}
   usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/...vscode-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearWhale.yml b/...vscode-e2e/src/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearWhale.yml
@@ -1,12 +1,13 @@
 languageId: python
 command:
+  version: 6
   spokenForm: change whale
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: w}
   usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/...uite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/takeLookCloneLineWordFrown.yml b/...uite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/takeLookCloneLineWordFrown.yml
@@ -1,12 +1,13 @@
 languageId: python
 command:
+  version: 6
   spokenForm: take look
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: setSelection
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: l}
   usePrePhraseSnapshot: false
-  action: {name: setSelection}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/...ite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/takeLookCloneLineWordFrown2.yml b/...ite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/takeLookCloneLineWordFrown2.yml
@@ -1,14 +1,15 @@
 languageId: python
 command:
+  version: 6
   spokenForm: clone line
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: insertCopyAfter
+    target:
+      type: primitive
       modifiers:
         - type: containingScope
           scopeType: {type: line}
   usePrePhraseSnapshot: false
-  action: {name: insertCopyAfter}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/chuckDrum.yml b/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/chuckDrum.yml
@@ -1,12 +1,13 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: chuck drum
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: remove
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: d}
   usePrePhraseSnapshot: false
-  action: {name: remove}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...ursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/chuckLineLook.yml b/...ursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/chuckLineLook.yml
@@ -1,15 +1,16 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: chuck line look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
+  action:
+    name: remove
+    target:
+      type: primitive
       modifiers:
         - type: containingScope
           scopeType: {type: line}
+      mark: {type: decoratedSymbol, symbolColor: default, character: l}
   usePrePhraseSnapshot: false
-  action: {name: remove}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/clearTrap.yml b/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/clearTrap.yml
@@ -1,12 +1,13 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: change trap
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: t}
   usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...rless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/clearWhaleWordYou.yml b/...rless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/clearWhaleWordYou.yml
@@ -1,12 +1,13 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: change whale
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: w}
   usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/postLook.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/postLook.yml
@@ -1,12 +1,13 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: post look
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: setSelectionAfter
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: l}
   usePrePhraseSnapshot: false
-  action: {name: setSelectionAfter}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/preInk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/preInk.yml
@@ -1,12 +1,13 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: pre sit
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: setSelectionBefore
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: i}
   usePrePhraseSnapshot: false
-  action: {name: setSelectionBefore}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/.../cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeBlueSun.yml b/.../cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeBlueSun.yml
@@ -1,12 +1,13 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: take blue sun
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: setSelection
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: blue, character: s}
   usePrePhraseSnapshot: false
-  action: {name: setSelection}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...sorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeCapAndWhale.yml b/...sorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeCapAndWhale.yml
@@ -1,16 +1,17 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: take cap and whale
-  version: 2
-  targets:
-    - type: list
+  action:
+    name: setSelection
+    target:
+      type: list
       elements:
         - type: primitive
           mark: {type: decoratedSymbol, symbolColor: default, character: c}
         - type: primitive
           mark: {type: decoratedSymbol, symbolColor: default, character: w}
   usePrePhraseSnapshot: false
-  action: {name: setSelection}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...orless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeEachPastKick.yml b/...orless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeEachPastKick.yml
@@ -1,9 +1,11 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: take each past crunch
-  version: 2
-  targets:
-    - type: range
+  action:
+    name: setSelection
+    target:
+      type: range
       anchor:
         type: primitive
         mark: {type: decoratedSymbol, symbolColor: default, character: e}
@@ -13,7 +15,6 @@ command:
       excludeAnchor: false
       excludeActive: false
   usePrePhraseSnapshot: false
-  action: {name: setSelection}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeLine.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeLine.yml
@@ -1,14 +1,15 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: take line
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: setSelection
+    target:
+      type: primitive
       modifiers:
         - type: containingScope
           scopeType: {type: line}
   usePrePhraseSnapshot: false
-  action: {name: setSelection}
 initialState:
   documentContents: |-
     ==================================================

diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeWhale.yml b/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/tutorial/unit-1-basics/takeWhale.yml
@@ -1,12 +1,13 @@
 languageId: plaintext
 command:
+  version: 6
   spokenForm: take whale
-  version: 2
-  targets:
-    - type: primitive
+  action:
+    name: setSelection
+    target:
+      type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: w}
   usePrePhraseSnapshot: false
-  action: {name: setSelection}
 initialState:
   documentContents: |-
     ==================================================