Update unit tests

pokey · pokey · commit e71a06b1e732 · 2023-10-17T15:10:51.000+01:00
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml
@@ -1,7 +1,7 @@
 languageId: typescript
 command:
   version: 1
-  spokenForm: take harp and string each
+  spokenForm: take harp and parse tree string each
   action: setSelection
   targets:
     - type: list
@@ -11,7 +11,6 @@ command:
         - type: primitive
           modifier: {type: containingScope, scopeType: string}
           mark: {type: decoratedSymbol, symbolColor: default, character: e}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml
@@ -1,7 +1,7 @@
 languageId: typescript
 command:
   version: 1
-  spokenForm: take harp past string each
+  spokenForm: take harp past parse tree string each
   action: setSelection
   targets:
     - type: range
@@ -14,7 +14,6 @@ command:
         mark: {type: decoratedSymbol, symbolColor: default, character: e}
       excludeStart: false
       excludeEnd: false
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml
@@ -1,7 +1,7 @@
 languageId: typescript
 command:
   version: 1
-  spokenForm: take string harp and each
+  spokenForm: take parse tree string harp and each
   action: setSelection
   targets:
     - type: list
@@ -11,7 +11,6 @@ command:
           mark: {type: decoratedSymbol, symbolColor: default, character: h}
         - type: primitive
           mark: {type: decoratedSymbol, symbolColor: default, character: e}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml
@@ -1,7 +1,7 @@
 languageId: typescript
 command:
   version: 1
-  spokenForm: take string harp past each
+  spokenForm: take parse tree string harp past each
   action: setSelection
   targets:
     - type: range
@@ -14,7 +14,6 @@ command:
         mark: {type: decoratedSymbol, symbolColor: default, character: e}
       excludeStart: false
       excludeEnd: false
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject.yml
@@ -9,7 +9,6 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |
     int main() {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject2.yml
@@ -9,7 +9,6 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: false
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |
     int main() {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeString.yml
@@ -1,12 +1,11 @@
 languageId: cpp
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
     char* a = "hello world";
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject.yml
@@ -9,7 +9,6 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |-
     switch (aaa) {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject2.yml
@@ -9,7 +9,6 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: false
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |-
     switch (aaa + 1) {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeString.yml
@@ -1,12 +1,11 @@
 languageId: go
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: x := "hello world"
   selections:
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject.yml
@@ -9,7 +9,6 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |
     class Aaa {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject2.yml
@@ -9,7 +9,6 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |
     class Aaa {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeString.yml
@@ -1,12 +1,11 @@
 languageId: java
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeString.yml
@@ -1,12 +1,11 @@
 languageId: json
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearSubject.yml
@@ -9,7 +9,6 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |
     match 0:
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString.yml
@@ -1,12 +1,11 @@
 languageId: python
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString2.yml
@@ -1,12 +1,11 @@
 languageId: python
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString3.yml
@@ -1,12 +1,11 @@
 languageId: python
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString4.yml
@@ -1,12 +1,11 @@
 languageId: python
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeSubject.yml
@@ -9,7 +9,6 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |
     match user {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString.yml
@@ -1,12 +1,11 @@
 languageId: scala
 command:
   version: 0
-  spokenForm: change string
+  spokenForm: change parse tree string
   action: clearAndSetSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
     class ExampleClass() {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString2.yml
@@ -1,12 +1,11 @@
 languageId: scala
 command:
   version: 0
-  spokenForm: change string
+  spokenForm: change parse tree string
   action: clearAndSetSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
     val string = """
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearStringOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearStringOdd.yml
@@ -1,13 +1,12 @@
 languageId: scala
 command:
   version: 0
-  spokenForm: change string odd
+  spokenForm: change parse tree string odd
   action: clearAndSetSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
       mark: {type: decoratedSymbol, symbolColor: default, character: o}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
     class ExampleClass() {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearSubject.yml
@@ -9,7 +9,6 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |
     def matchTest(x: Int): String = x match {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject.yml
@@ -9,7 +9,6 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |-
     switch(aaa) {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject2.yml
@@ -9,7 +9,6 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
-spokenFormError: Scope type 'switchStatementSubject'
 initialState:
   documentContents: |-
     switch(aaa + 1) {
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeString.yml
@@ -1,12 +1,11 @@
 languageId: typescript
 command:
   version: 1
-  spokenForm: take string
+  spokenForm: take parse tree string
   action: setSelection
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
-spokenFormError: Scope type 'string'
 initialState:
   documentContents: |
 
