Migrate rust scope implementations (#2950)

Author: AndreasArvidsson

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

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg blue air
+  spokenForm: change type blue air
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: blue, character: a}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg sun
+  spokenForm: change type sun
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: default, character: s}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg trap
+  spokenForm: change type trap
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: default, character: t}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -1,7 +1,7 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg trap and blue trap
+  spokenForm: change arg trap and type blue trap
   action:
     name: clearAndSetSelection
     target:
@@ -13,6 +13,9 @@ command:
               scopeType: {type: argumentOrParameter}
           mark: {type: decoratedSymbol, symbolColor: default, character: t}
         - type: primitive
+          modifiers:
+            - type: containingScope
+              scopeType: {type: type}
           mark: {type: decoratedSymbol, symbolColor: blue, character: t}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change name drum
+  spokenForm: change key drum
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: name}
+          scopeType: {type: collectionKey}
       mark: {type: decoratedSymbol, symbolColor: default, character: d}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change name drum
+  spokenForm: change key drum
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: name}
+          scopeType: {type: collectionKey}
       mark: {type: decoratedSymbol, symbolColor: default, character: d}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change name jury
+  spokenForm: change key jury
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: name}
+          scopeType: {type: collectionKey}
       mark: {type: decoratedSymbol, symbolColor: default, character: j}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change name look
+  spokenForm: change key look
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: name}
+          scopeType: {type: collectionKey}
       mark: {type: decoratedSymbol, symbolColor: default, character: l}
   usePrePhraseSnapshot: true
 initialState:

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

@@ -26,8 +26,8 @@ initialState:
       end: {line: 0, character: 18}
 finalState:
   documentContents: |
-    fn some_function<T: , U: Clone + Debug>(t: &T, u: &U) -> i32 {
+    fn some_function<, U: Clone + Debug>(t: &T, u: &U) -> i32 {
     }
   selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
+    - anchor: {line: 0, character: 17}
+      active: {line: 0, character: 17}

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

@@ -27,9 +27,9 @@ initialState:
 finalState:
   documentContents: |
     fn some_function<T, U>(t: &T, u: &U) -> i32
-        where T: ,
+        where ,
               U: Clone + Debug
     {}
   selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
+    - anchor: {line: 1, character: 10}
+      active: {line: 1, character: 10}