Replace private.switchStatementSubject with value scope

cursorless-talon/src/spoken_forms.py

@@ -156,7 +156,6 @@ def handle_new_values(csv_name: str, values: list[SpokenFormEntry]):
             ],
             extra_allowed_values=[
                 "private.fieldAccess",
-                "private.switchStatementSubject",
                 "textFragment",
                 "disqualifyDelimiter",
                 "pairDelimiter",

data/fixtures/recorded/languages/cpp/clearSubject.yml

@@ -1,18 +1,15 @@
 languageId: cpp
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     int main() {

data/fixtures/recorded/languages/cpp/clearSubject2.yml

@@ -1,18 +1,15 @@
 languageId: cpp
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: false
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     int main() {

data/fixtures/recorded/languages/java/clearSubject.yml

@@ -1,18 +1,15 @@
 languageId: java
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     class Aaa {

data/fixtures/recorded/languages/java/clearSubject2.yml

@@ -1,18 +1,15 @@
 languageId: java
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     class Aaa {

data/fixtures/recorded/languages/python/clearSubject.yml

@@ -1,18 +1,15 @@
 languageId: python
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     match 0:

data/fixtures/recorded/languages/rust/changeSubject.yml

@@ -1,18 +1,15 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     match user {

data/fixtures/recorded/languages/scala/clearSubject.yml

@@ -1,18 +1,15 @@
 languageId: scala
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     def matchTest(x: Int): String = x match {

data/fixtures/recorded/languages/typescript/clearSubject.yml

@@ -1,18 +1,15 @@
 languageId: typescript
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |-
     switch(aaa) {

data/fixtures/recorded/languages/typescript/clearSubject2.yml

@@ -1,18 +1,15 @@
 languageId: typescript
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |-
     switch(aaa + 1) {

data/fixtures/scopes/cpp/value.switch.scope

@@ -0,0 +1,13 @@
+switch (value) {}
+---
+
+[Content] =
+[Removal] = 0:8-0:13
+          >-----<
+0| switch (value) {}
+
+[Domain] = 0:0-0:17
+  >-----------------<
+0| switch (value) {}
+
+[Insertion delimiter] = " "

data/fixtures/scopes/csharp/value.switch.scope

@@ -0,0 +1,13 @@
+switch (value) {}
+---
+
+[Content] =
+[Removal] = 0:8-0:13
+          >-----<
+0| switch (value) {}
+
+[Domain] = 0:0-0:17
+  >-----------------<
+0| switch (value) {}
+
+[Insertion delimiter] = " "

data/fixtures/scopes/java/value.switch.scope

@@ -0,0 +1,13 @@
+switch (value) {}
+---
+
+[Content] =
+[Removal] = 0:8-0:13
+          >-----<
+0| switch (value) {}
+
+[Domain] = 0:0-0:17
+  >-----------------<
+0| switch (value) {}
+
+[Insertion delimiter] = " "

data/fixtures/scopes/java/value/value.yield.scope

@@ -6,39 +6,57 @@ switch (value) {
 }
 ---
 
-[#1 Content] = 2:14-2:19
+[#1 Content] =
+[#1 Removal] = 0:8-0:13
+          >-----<
+0| switch (value) {
+
+[#1 Domain] = 0:0-5:1
+  >----------------
+0| switch (value) {
+1|     case 1:
+2|         yield "foo";
+3|     default:
+4|         yield "bar";
+5| }
+   -<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 2:14-2:19
                 >-----<
 2|         yield "foo";
 
-[#1 Removal] = 2:13-2:19
+[#2 Removal] = 2:13-2:19
                >------<
 2|         yield "foo";
 
-[#1 Leading delimiter] = 2:13-2:14
+[#2 Leading delimiter] = 2:13-2:14
                >-<
 2|         yield "foo";
 
-[#1 Domain] = 2:8-2:20
+[#2 Domain] = 2:8-2:20
           >------------<
 2|         yield "foo";
 
-[#1 Insertion delimiter] = " "
+[#2 Insertion delimiter] = " "
 
 
-[#2 Content] = 4:14-4:19
+[#3 Content] = 4:14-4:19
                 >-----<
 4|         yield "bar";
 
-[#2 Removal] = 4:13-4:19
+[#3 Removal] = 4:13-4:19
                >------<
 4|         yield "bar";
 
-[#2 Leading delimiter] = 4:13-4:14
+[#3 Leading delimiter] = 4:13-4:14
                >-<
 4|         yield "bar";
 
-[#2 Domain] = 4:8-4:20
+[#3 Domain] = 4:8-4:20
           >------------<
 4|         yield "bar";
 
-[#2 Insertion delimiter] = " "
+[#3 Insertion delimiter] = " "