Update tests with type scope

AndreasArvidsson · AndreasArvidsson · commit 999d164cae72 · 2025-06-03T08:55:52.000+02:00
diff --git a/data/fixtures/recorded/languages/rust/changeArgBlueAir.yml b/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:
@@ -21,4 +21,9 @@ initialState:
     blue.a:
       start: {line: 0, character: 18}
       end: {line: 0, character: 19}
-thrownError: {name: NoContainingScopeError}
+finalState:
+  documentContents: |
+    struct S<'a, , T>;
+  selections:
+    - anchor: {line: 0, character: 13}
+      active: {line: 0, character: 13}
diff --git a/data/fixtures/recorded/languages/rust/changeArgSun.yml b/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:
@@ -24,4 +24,4 @@ initialState:
     default.s:
       start: {line: 0, character: 20}
       end: {line: 0, character: 27}
-thrownError: {name: NoContainingScopeError}
+thrownError: {name: Error}
diff --git a/data/fixtures/recorded/languages/rust/changeArgTrap.yml b/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:
@@ -21,4 +21,9 @@ initialState:
     default.t:
       start: {line: 0, character: 21}
       end: {line: 0, character: 22}
-thrownError: {name: NoContainingScopeError}
+finalState:
+  documentContents: |
+    struct S<'a, 'b: 'a, > {};
+  selections:
+    - anchor: {line: 0, character: 21}
+      active: {line: 0, character: 21}
diff --git a/data/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml b/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 type trap and blue trap
   action:
     name: clearAndSetSelection
     target:
@@ -10,7 +10,7 @@ command:
         - type: primitive
           modifiers:
             - type: containingScope
-              scopeType: {type: argumentOrParameter}
+              scopeType: {type: type}
           mark: {type: decoratedSymbol, symbolColor: default, character: t}
         - type: primitive
           mark: {type: decoratedSymbol, symbolColor: blue, character: t}
diff --git a/data/fixtures/recorded/languages/rust/changeTypeTrap.yml b/data/fixtures/recorded/languages/rust/changeTypeTrap.yml
@@ -24,10 +24,4 @@ initialState:
     default.t:
       start: {line: 0, character: 17}
       end: {line: 0, character: 18}
-finalState:
-  documentContents: |
-    fn some_function<T: , U: Clone + Debug>(t: &T, u: &U) -> i32 {
-    }
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
+thrownError: {name: Error}
diff --git a/data/fixtures/recorded/languages/rust/chuckArgAir.yml b/data/fixtures/recorded/languages/rust/chuckArgAir.yml
@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: chuck arg air
+  spokenForm: chuck type air
   action:
     name: remove
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: default, character: a}
   usePrePhraseSnapshot: true
 initialState:
@@ -21,4 +21,9 @@ initialState:
     default.a:
       start: {line: 0, character: 10}
       end: {line: 0, character: 11}
-thrownError: {name: NoContainingScopeError}
+finalState:
+  documentContents: |
+    struct S<'b: 'a, T>;
+  selections:
+    - anchor: {line: 1, character: 0}
+      active: {line: 1, character: 0}
diff --git a/data/fixtures/recorded/languages/rust/chuckArgBlueAir.yml b/data/fixtures/recorded/languages/rust/chuckArgBlueAir.yml
@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: chuck arg blue air
+  spokenForm: chuck type blue air
   action:
     name: remove
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: blue, character: a}
   usePrePhraseSnapshot: true
 initialState:
@@ -21,4 +21,9 @@ initialState:
     blue.a:
       start: {line: 0, character: 18}
       end: {line: 0, character: 19}
-thrownError: {name: NoContainingScopeError}
+finalState:
+  documentContents: |
+    struct S<'a, T>;
+  selections:
+    - anchor: {line: 1, character: 0}
+      active: {line: 1, character: 0}
diff --git a/data/fixtures/recorded/languages/rust/chuckArgSun2.yml b/data/fixtures/recorded/languages/rust/chuckArgSun2.yml
@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: chuck arg sun
+  spokenForm: chuck type sun
   action:
     name: remove
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: default, character: s}
   usePrePhraseSnapshot: true
 initialState:
@@ -24,4 +24,4 @@ initialState:
     default.s:
       start: {line: 0, character: 20}
       end: {line: 0, character: 27}
-thrownError: {name: NoContainingScopeError}
+thrownError: {name: Error}
diff --git a/data/fixtures/recorded/languages/rust/chuckArgTrap.yml b/data/fixtures/recorded/languages/rust/chuckArgTrap.yml
@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: chuck arg trap
+  spokenForm: chuck type trap
   action:
     name: remove
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: default, character: t}
   usePrePhraseSnapshot: true
 initialState:
@@ -21,4 +21,9 @@ initialState:
     default.t:
       start: {line: 0, character: 21}
       end: {line: 0, character: 22}
-thrownError: {name: NoContainingScopeError}
+finalState:
+  documentContents: |
+    struct S<'a, 'b: 'a> {};
+  selections:
+    - anchor: {line: 1, character: 0}
+      active: {line: 1, character: 0}
diff --git a/queries/rust.scm b/queries/rust.scm
@@ -419,6 +419,28 @@
   (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
+;;!! #[derive(aaa, bbb)]
+;;!           ^^^  ^^^
+(_
+  (type_parameters
+    (_)? @_.leading.endOf
+    .
+    (_) @type
+    .
+    (_)? @_.trailing.startOf
+  ) @_dummy
+  (#single-or-multi-line-delimiter! @type @_dummy ", " ",\n")
+)
+
+;;!! #[derive(aaa, bbb)]
+;;!           ^^^^^^^^
+(_
+  (type_parameters
+    "<" @type.iteration.start.endOf
+    ">" @type.iteration.end.startOf
+  )
+) @type.iteration.domain
+
 operator: [
   "<"
   "<<"
