Skip to content

Commit 979a7cc

Browse files
Migrate value
1 parent 833cbff commit 979a7cc

File tree

8 files changed

+47
-229
lines changed

8 files changed

+47
-229
lines changed

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

packages/cursorless-engine/src/languages/rust.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
leadingMatcher,
1313
matcher,
1414
patternMatcher,
15-
trailingMatcher,
1615
} from "../util/nodeMatchers";
1716
import {
1817
childRangeSelector,
@@ -97,24 +96,6 @@ const nodeMatchers: Partial<
9796
"type_parameters",
9897
"ordered_field_declaration_list",
9998
),
100-
name: cascadingMatcher(
101-
patternMatcher(
102-
"let_declaration.identifier!",
103-
"parameter.identifier!",
104-
"function_item[name]",
105-
"struct_item[name]",
106-
"enum_item[name]",
107-
"enum_variant[name]",
108-
"trait_item[name]",
109-
"const_item[name]",
110-
"meta_item.identifier!",
111-
"let_declaration[pattern]",
112-
"constrained_type_parameter[left]",
113-
"where_predicate[left]",
114-
"field_declaration[name]",
115-
),
116-
trailingMatcher(["field_initializer[name]", "field_pattern[name]"], [":"]),
117-
),
11899
branch: cascadingMatcher(
119100
patternMatcher("match_arm"),
120101
matcher(patternFinder("else_clause"), elseExtractor("if_expression")),

queries/rust.scm

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,48 @@
5757

5858
[
5959
(struct_item
60-
name: (_) @className
60+
name: (_) @className @name
6161
)
6262
(enum_item
63-
name: (_) @className
63+
name: (_) @className @name
6464
)
65-
] @class @className.domain
65+
] @class @_.domain
6666

6767
(struct_expression) @class
6868

69+
(enum_variant
70+
name: (_) @name
71+
) @_.domain
72+
6973
(trait_item
70-
name: (_) @className
74+
name: (_) @className @name
7175
) @_.domain
7276

7377
(function_item
74-
name: (_) @functionName
75-
) @namedFunction @functionName.domain
78+
name: (_) @functionName @name
79+
) @namedFunction @_.domain
80+
81+
(field_declaration
82+
name: (_) @name
83+
) @_.domain
84+
85+
;;!! where T: Display + Clone
86+
;;! ^
87+
(where_predicate
88+
left: (_) @name
89+
) @_.domain
90+
91+
;;!! (t: &T, u: &U)
92+
;;! ^ ^
93+
(parameter
94+
pattern: (_) @name
95+
) @_.domain
96+
97+
;;!! <T: Display, U: Clone>
98+
;;! ^ ^
99+
(constrained_type_parameter
100+
left: (_) @name
101+
) @_.domain
76102

77103
[
78104
(call_expression)
@@ -126,23 +152,34 @@
126152
;;!! const foo: u8 = 2;
127153
;;! ^
128154
(const_item
129-
(_) @value.leading.endOf
130-
.
155+
name: (_) @name
156+
type: (_) @value.leading.endOf
131157
value: (_) @value
132158
) @_.domain
133159

134160
;;!! let foo = 2;
161+
;;! ^^^
135162
;;! ^
136163
(let_declaration
137-
(_) @value.leading.endOf
164+
pattern: (_) @name @value.leading.start.endOf
138165
.
139166
value: (_) @value
140167
) @_.domain
141168

169+
;;!! let foo: u8 = 2;
170+
;;! ^^^
171+
;;! ^
172+
(let_declaration
173+
pattern: (_) @name
174+
type: (_) @value.leading.start.endOf
175+
value: (_) @value
176+
) @_.domain
177+
142178
;;!! #[cfg_attr(feature = "foo")]
179+
;;! ^^^^^^^
143180
;;! ^^^^^
144181
(meta_item
145-
(_) @value.leading.endOf
182+
(identifier) @name @value.leading.endOf
146183
value: (_) @value
147184
) @_.domain
148185

0 commit comments

Comments
 (0)