More type fixes

Author: AndreasArvidsson

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

@@ -1,7 +1,7 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change type trap and blue trap
+  spokenForm: change arg trap and type blue trap
   action:
     name: clearAndSetSelection
     target:
@@ -10,11 +10,11 @@ command:
         - type: primitive
           modifiers:
             - type: containingScope
-              scopeType: {type: type}
+              scopeType: {type: argumentOrParameter}
           mark: {type: decoratedSymbol, symbolColor: default, character: t}
         - type: primitive
           modifiers:
-            - type: argumentOrParameter
+            - type: containingScope
               scopeType: {type: type}
           mark: {type: decoratedSymbol, symbolColor: blue, character: t}
   usePrePhraseSnapshot: true
@@ -34,4 +34,14 @@ initialState:
     blue.t:
       start: {line: 0, character: 11}
       end: {line: 0, character: 12}
-thrownError: {name: NoContainingScopeError}
+finalState:
+  documentContents: |
+    enum Maybe<> {
+        Just(),
+        Nothing,
+    }
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}
+    - anchor: {line: 1, character: 9}
+      active: {line: 1, character: 9}

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

@@ -26,10 +26,10 @@ initialState:
       end: {line: 1, character: 11}
 finalState:
   documentContents: |
-    fn some_function<T, U>(t: &T, u: &U) -> 
-        where T: Display + Clone,
+    fn some_function<T, U>(t: &T, u: &U) -> i32
+        where ,
               U: Clone + Debug
     {}
   selections:
-    - anchor: {line: 0, character: 40}
-      active: {line: 0, character: 40}
+    - anchor: {line: 1, character: 10}
+      active: {line: 1, character: 10}

queries/rust.scm

@@ -419,8 +419,8 @@
   (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
-;;!! #[derive(aaa, bbb)]
-;;!           ^^^  ^^^
+;;!! fn foo<T: Display, U: Clone>() {}
+;;!         ^^^^^^^^^^  ^^^^^^^^
 (_
   (type_parameters
     (_)? @_.leading.endOf
@@ -432,15 +432,34 @@
   (#single-or-multi-line-delimiter! @type @_dummy ", " ",\n")
 )
 
-;;!! #[derive(aaa, bbb)]
-;;!           ^^^^^^^^
+;;!! fn foo<T: Display, U: Clone>() {}
+;;!         ^^^^^^^^^^^^^^^^^^^^
 (_
   (type_parameters
     "<" @type.iteration.start.endOf
     ">" @type.iteration.end.startOf
   )
 ) @type.iteration.domain
 
+;;!! where T: Display, U: Clone
+;;!        ^^^^^^^^^^  ^^^^^^^^
+(
+  (where_clause
+    (_)? @_.leading.endOf
+    .
+    (_) @type
+    .
+    (_)? @_.trailing.startOf
+  ) @_dummy
+  (#single-or-multi-line-delimiter! @type @_dummy ", " ",\n")
+)
+
+;;!! where T: Display, U: Clone
+;;!        ^^^^^^^^^^^^^^^^^^^^
+(where_clause
+  "where" @type.iteration.start.endOf
+) @type.iteration.end.endOf @type.iteration.domain
+
 operator: [
   "<"
   "<<"