Don't test spoken forms for secret scopes

pokey · pokey · commit d63c8538438c · 2023-10-17T15:10:51.000+01:00
diff --git a/packages/cursorless-engine/src/generateSpokenForm/generateSpokenForm.test.ts b/packages/cursorless-engine/src/generateSpokenForm/generateSpokenForm.test.ts
@@ -17,12 +17,12 @@ import { SpokenFormMap, SpokenFormMapEntry } from "../SpokenFormMap";
 const spokenFormMap = mapValues(defaultSpokenFormInfo, (entry) =>
   mapValues(
     entry,
-    ({ defaultSpokenForms }): SpokenFormMapEntry => ({
-      spokenForms: defaultSpokenForms,
+    ({ defaultSpokenForms, isSecret }): SpokenFormMapEntry => ({
+      spokenForms: isSecret ? [] : defaultSpokenForms,
       isCustom: false,
       defaultSpokenForms,
       requiresTalonUpdate: false,
-      isSecret: false,
+      isSecret,
     }),
   ),
 ) as SpokenFormMap;
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
@@ -11,6 +11,9 @@ command:
         - type: primitive
           modifier: {type: containingScope, scopeType: string}
           mark: {type: decoratedSymbol, symbolColor: default, character: e}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -14,6 +14,9 @@ command:
         mark: {type: decoratedSymbol, symbolColor: default, character: e}
       excludeStart: false
       excludeEnd: false
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -11,6 +11,9 @@ command:
           mark: {type: decoratedSymbol, symbolColor: default, character: h}
         - type: primitive
           mark: {type: decoratedSymbol, symbolColor: default, character: e}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -14,6 +14,9 @@ command:
         mark: {type: decoratedSymbol, symbolColor: default, character: e}
       excludeStart: false
       excludeEnd: false
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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,6 +9,9 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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,6 +9,9 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: false
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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,6 +9,9 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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,6 +9,9 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: false
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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,6 +9,9 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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,6 +9,9 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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,6 +9,9 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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,6 +9,9 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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
@@ -7,6 +7,9 @@ command:
     - type: primitive
       modifier: {type: containingScope, scopeType: string, includeSiblings: false}
       mark: {type: decoratedSymbol, symbolColor: default, character: o}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 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,6 +9,9 @@ command:
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
   action: {name: clearAndSetSelection}
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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,6 +9,9 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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,6 +9,9 @@ command:
         - type: containingScope
           scopeType: {type: switchStatementSubject}
   usePrePhraseSnapshot: true
+spokenFormError: >-
+  simple scope type type with id switchStatementSubject; this is a secret spoken
+  form currently only for internal experimentation
 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
@@ -6,6 +6,9 @@ command:
   targets:
     - type: primitive
       modifier: {type: containingScope, scopeType: string}
+spokenFormError: >-
+  simple scope type type with id string; this is a secret spoken form currently
+  only for internal experimentation
 initialState:
   documentContents: |
 
