Test cleanup

Author: pokey

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/queryBasedMatchers/changeList7.yml renamed to packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearCall.yml

@@ -1,22 +1,24 @@
 languageId: ruby
 command:
   version: 5
-  spokenForm: change list
+  spokenForm: clear call
   action: {name: clearAndSetSelection}
   targets:
     - type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: list}
-  usePrePhraseSnapshot: false
+          scopeType: {type: functionCall}
+  usePrePhraseSnapshot: true
 initialState:
-  documentContents: "[\"hello\"] "
+  documentContents: |
+    aaa(bbb())
   selections:
-    - anchor: {line: 0, character: 6}
+    - anchor: {line: 0, character: 2}
       active: {line: 0, character: 6}
   marks: {}
 finalState:
-  documentContents: " "
+  documentContents: |+
+
   selections:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearCall2.yml

@@ -0,0 +1,22 @@
+languageId: ruby
+command:
+  version: 5
+  spokenForm: clear call
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionCall}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa(bbb(), ccc())
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 13}
+  marks: {}
+finalState:
+  documentContents: aaa()
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstFunk.yml

@@ -1,22 +1,18 @@
 languageId: ruby
 command:
   version: 5
-  spokenForm: change list
+  spokenForm: clear call
   action: {name: clearAndSetSelection}
   targets:
     - type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: list}
-  usePrePhraseSnapshot: false
+          scopeType: {type: functionCall}
+  usePrePhraseSnapshot: true
 initialState:
-  documentContents: "[\"hello\"]"
+  documentContents: " aaa()"
   selections:
-    - anchor: {line: 0, character: 1}
+    - anchor: {line: 0, character: 0}
       active: {line: 0, character: 1}
   marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastFunk.yml

@@ -0,0 +1,18 @@
+languageId: ruby
+command:
+  version: 5
+  spokenForm: clear call
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionCall}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: " aaa()"
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 2}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/queryBasedMatchers/changeList.yml

@@ -1,22 +1,18 @@
 languageId: ruby
 command:
   version: 5
-  spokenForm: change list
+  spokenForm: clear call
   action: {name: clearAndSetSelection}
   targets:
     - type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: list}
-  usePrePhraseSnapshot: false
+          scopeType: {type: functionCall}
+  usePrePhraseSnapshot: true
 initialState:
-  documentContents: "[\"hello\"] "
+  documentContents: " aaa() "
   selections:
-    - anchor: {line: 0, character: 4}
+    - anchor: {line: 0, character: 0}
       active: {line: 0, character: 7}
   marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/queryBasedMatchers/changeList10.yml

@@ -1,16 +1,16 @@
 languageId: ruby
 command:
   version: 5
-  spokenForm: change list
+  spokenForm: clear call
   action: {name: clearAndSetSelection}
   targets:
     - type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: list}
-  usePrePhraseSnapshot: false
+          scopeType: {type: functionCall}
+  usePrePhraseSnapshot: true
 initialState:
-  documentContents: "[1, 2, 3, [4, 5, 6, [7, 8, 9]]]"
+  documentContents: aaa()
   selections:
     - anchor: {line: 0, character: 5}
       active: {line: 0, character: 5}