Upgrade tutorial steps

cursorless-dev · Jul 7, 2022 · 69f6d5f · 69f6d5f
1 parent de84be0
commit 69f6d5f
Show file tree

Hide file tree

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

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

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

diff --git a/...test/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearDownScoreAndCap.yml b/...test/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearDownScoreAndCap.yml
@@ -1,15 +1,16 @@
 languageId: python
 command:
-  version: 1
   spokenForm: clear down score and cap
-  action: clearAndSetSelection
+  version: 2
   targets:
     - 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/src/test/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearRepperLeper.yml b/src/test/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearRepperLeper.yml
@@ -1,11 +1,12 @@
 languageId: python
 command:
-  version: 1
   spokenForm: clear repper leper
-  action: clearAndSetSelection
+  version: 2
   targets:
     - type: primitive
       mark: {type: decoratedSymbol, symbolColor: default, character: )}
+  usePrePhraseSnapshot: false
+  action: {name: clearAndSetSelection}
 initialState:
   documentContents: |-
     from talon import Context, Module

diff --git a/src/test/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearWhale.yml b/src/test/suite/fixtures/recorded/tutorial/extra-cloning-a-talon-list/clearWhale.yml
@@ -1,11 +1,12 @@
 languageId: python
 command:
-  version: 1
   spokenForm: clear whale
-  action: clearAndSetSelection
+  version: 2
   targets:
     - 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,11 +1,12 @@
 languageId: python
 command:
-  version: 1
   spokenForm: take look clone line word frown
-  action: setSelection
+  version: 2
   targets:
     - 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,10 +1,14 @@
 languageId: python
 command:
-  version: 1
   spokenForm: take look clone line word frown
-  action: insertCopyAfter
+  version: 2
   targets:
-    - {type: primitive, selectionType: line}
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: line}
+  usePrePhraseSnapshot: false
+  action: {name: insertCopyAfter}
 initialState:
   documentContents: |-
     from talon import Context, Module

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

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

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

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

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

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

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

diff --git a/src/test/suite/fixtures/recorded/tutorial/unit-1-basics/takeCapAndWhale.yml b/src/test/suite/fixtures/recorded/tutorial/unit-1-basics/takeCapAndWhale.yml
@@ -1,15 +1,16 @@
 languageId: plaintext
 command:
-  version: 1
   spokenForm: take cap and whale
-  action: setSelection
+  version: 2
   targets:
     - 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/src/test/suite/fixtures/recorded/tutorial/unit-1-basics/takeEachPastKick.yml b/src/test/suite/fixtures/recorded/tutorial/unit-1-basics/takeEachPastKick.yml
@@ -1,18 +1,19 @@
 languageId: plaintext
 command:
-  version: 1
   spokenForm: take each past kick
-  action: setSelection
+  version: 2
   targets:
     - type: range
-      start:
+      anchor:
         type: primitive
         mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      end:
+      active:
         type: primitive
         mark: {type: decoratedSymbol, symbolColor: default, character: k}
-      excludeStart: false
-      excludeEnd: false
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: false
+  action: {name: setSelection}
 initialState:
   documentContents: |-
     ==================================================

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

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

diff --git a/src/test/suite/fixtures/recorded/tutorial/unit-2-basic-coding/bringBlueCapToValueRisk.yml b/src/test/suite/fixtures/recorded/tutorial/unit-2-basic-coding/bringBlueCapToValueRisk.yml
@@ -1,14 +1,17 @@
 languageId: python
 command:
-  version: 1
   spokenForm: bring blue cap to value risk
-  action: replaceWithTarget
+  version: 2
   targets:
     - type: primitive
       mark: {type: decoratedSymbol, symbolColor: blue, character: c}
     - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
       mark: {type: decoratedSymbol, symbolColor: default, character: r}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: false
+  action: {name: replaceWithTarget}
 initialState:
   documentContents: |
     def print_color(color, invert=False):

diff --git a/src/test/suite/fixtures/recorded/tutorial/unit-2-basic-coding/bringStateUrge.yml b/src/test/suite/fixtures/recorded/tutorial/unit-2-basic-coding/bringStateUrge.yml
@@ -1,13 +1,16 @@
 languageId: python
 command:
-  version: 1
   spokenForm: bring state urge
-  action: replaceWithTarget
+  version: 2
   targets:
     - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
       mark: {type: decoratedSymbol, symbolColor: default, character: u}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: statement}
     - {type: primitive, isImplicit: true}
+  usePrePhraseSnapshot: false
+  action: {name: replaceWithTarget}
 initialState:
   documentContents: |
     def print_color(color, invert=False):

diff --git a/src/test/suite/fixtures/recorded/tutorial/unit-2-basic-coding/chuckArgueBlueVest.yml b/src/test/suite/fixtures/recorded/tutorial/unit-2-basic-coding/chuckArgueBlueVest.yml
@@ -1,12 +1,15 @@
 languageId: python
 command:
-  version: 1
   spokenForm: chuck argue blue vest
-  action: remove
+  version: 2
   targets:
     - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
       mark: {type: decoratedSymbol, symbolColor: blue, character: v}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: argumentOrParameter}
+  usePrePhraseSnapshot: false
+  action: {name: remove}
 initialState:
   documentContents: |
     def print_color(color, invert=False):