diff options
Diffstat (limited to 'crates/assists/src/handlers/remove_dbg.rs')
-rw-r--r-- | crates/assists/src/handlers/remove_dbg.rs | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/crates/assists/src/handlers/remove_dbg.rs b/crates/assists/src/handlers/remove_dbg.rs index eae6367c1..6114091f2 100644 --- a/crates/assists/src/handlers/remove_dbg.rs +++ b/crates/assists/src/handlers/remove_dbg.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | use syntax::{ | 1 | use syntax::{ |
2 | ast::{self, AstNode}, | 2 | ast::{self, AstNode}, |
3 | match_ast, SyntaxElement, SyntaxKind, TextRange, TextSize, T, | 3 | match_ast, SyntaxElement, TextRange, TextSize, T, |
4 | }; | 4 | }; |
5 | 5 | ||
6 | use crate::{AssistContext, AssistId, AssistKind, Assists}; | 6 | use crate::{AssistContext, AssistId, AssistKind, Assists}; |
@@ -11,7 +11,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists}; | |||
11 | // | 11 | // |
12 | // ``` | 12 | // ``` |
13 | // fn main() { | 13 | // fn main() { |
14 | // <|>dbg!(92); | 14 | // $0dbg!(92); |
15 | // } | 15 | // } |
16 | // ``` | 16 | // ``` |
17 | // -> | 17 | // -> |
@@ -136,14 +136,14 @@ fn needs_parentheses_around_macro_contents(macro_contents: Vec<SyntaxElement>) - | |||
136 | symbol_kind => { | 136 | symbol_kind => { |
137 | let symbol_not_in_bracket = unpaired_brackets_in_contents.is_empty(); | 137 | let symbol_not_in_bracket = unpaired_brackets_in_contents.is_empty(); |
138 | if symbol_not_in_bracket | 138 | if symbol_not_in_bracket |
139 | && symbol_kind != SyntaxKind::COLON // paths | 139 | && symbol_kind != T![:] // paths |
140 | && (symbol_kind != SyntaxKind::DOT // field/method access | 140 | && (symbol_kind != T![.] // field/method access |
141 | || macro_contents // range expressions consist of two SyntaxKind::Dot in macro invocations | 141 | || macro_contents // range expressions consist of two SyntaxKind::Dot in macro invocations |
142 | .peek() | 142 | .peek() |
143 | .map(|element| element.kind() == SyntaxKind::DOT) | 143 | .map(|element| element.kind() == T![.]) |
144 | .unwrap_or(false)) | 144 | .unwrap_or(false)) |
145 | && symbol_kind != SyntaxKind::QUESTION // try operator | 145 | && symbol_kind != T![?] // try operator |
146 | && (symbol_kind.is_punct() || symbol_kind == SyntaxKind::AS_KW) | 146 | && (symbol_kind.is_punct() || symbol_kind == T![as]) |
147 | { | 147 | { |
148 | return true; | 148 | return true; |
149 | } | 149 | } |
@@ -161,19 +161,19 @@ mod tests { | |||
161 | 161 | ||
162 | #[test] | 162 | #[test] |
163 | fn test_remove_dbg() { | 163 | fn test_remove_dbg() { |
164 | check_assist(remove_dbg, "<|>dbg!(1 + 1)", "1 + 1"); | 164 | check_assist(remove_dbg, "$0dbg!(1 + 1)", "1 + 1"); |
165 | 165 | ||
166 | check_assist(remove_dbg, "dbg!<|>((1 + 1))", "(1 + 1)"); | 166 | check_assist(remove_dbg, "dbg!$0((1 + 1))", "(1 + 1)"); |
167 | 167 | ||
168 | check_assist(remove_dbg, "dbg!(1 <|>+ 1)", "1 + 1"); | 168 | check_assist(remove_dbg, "dbg!(1 $0+ 1)", "1 + 1"); |
169 | 169 | ||
170 | check_assist(remove_dbg, "let _ = <|>dbg!(1 + 1)", "let _ = 1 + 1"); | 170 | check_assist(remove_dbg, "let _ = $0dbg!(1 + 1)", "let _ = 1 + 1"); |
171 | 171 | ||
172 | check_assist( | 172 | check_assist( |
173 | remove_dbg, | 173 | remove_dbg, |
174 | " | 174 | " |
175 | fn foo(n: usize) { | 175 | fn foo(n: usize) { |
176 | if let Some(_) = dbg!(n.<|>checked_sub(4)) { | 176 | if let Some(_) = dbg!(n.$0checked_sub(4)) { |
177 | // ... | 177 | // ... |
178 | } | 178 | } |
179 | } | 179 | } |
@@ -187,20 +187,20 @@ fn foo(n: usize) { | |||
187 | ", | 187 | ", |
188 | ); | 188 | ); |
189 | 189 | ||
190 | check_assist(remove_dbg, "<|>dbg!(Foo::foo_test()).bar()", "Foo::foo_test().bar()"); | 190 | check_assist(remove_dbg, "$0dbg!(Foo::foo_test()).bar()", "Foo::foo_test().bar()"); |
191 | } | 191 | } |
192 | 192 | ||
193 | #[test] | 193 | #[test] |
194 | fn test_remove_dbg_with_brackets_and_braces() { | 194 | fn test_remove_dbg_with_brackets_and_braces() { |
195 | check_assist(remove_dbg, "dbg![<|>1 + 1]", "1 + 1"); | 195 | check_assist(remove_dbg, "dbg![$01 + 1]", "1 + 1"); |
196 | check_assist(remove_dbg, "dbg!{<|>1 + 1}", "1 + 1"); | 196 | check_assist(remove_dbg, "dbg!{$01 + 1}", "1 + 1"); |
197 | } | 197 | } |
198 | 198 | ||
199 | #[test] | 199 | #[test] |
200 | fn test_remove_dbg_not_applicable() { | 200 | fn test_remove_dbg_not_applicable() { |
201 | check_assist_not_applicable(remove_dbg, "<|>vec![1, 2, 3]"); | 201 | check_assist_not_applicable(remove_dbg, "$0vec![1, 2, 3]"); |
202 | check_assist_not_applicable(remove_dbg, "<|>dbg(5, 6, 7)"); | 202 | check_assist_not_applicable(remove_dbg, "$0dbg(5, 6, 7)"); |
203 | check_assist_not_applicable(remove_dbg, "<|>dbg!(5, 6, 7"); | 203 | check_assist_not_applicable(remove_dbg, "$0dbg!(5, 6, 7"); |
204 | } | 204 | } |
205 | 205 | ||
206 | #[test] | 206 | #[test] |
@@ -209,7 +209,7 @@ fn foo(n: usize) { | |||
209 | remove_dbg, | 209 | remove_dbg, |
210 | " | 210 | " |
211 | fn foo(n: usize) { | 211 | fn foo(n: usize) { |
212 | if let Some(_) = dbg!(n.<|>checked_sub(4)) { | 212 | if let Some(_) = dbg!(n.$0checked_sub(4)) { |
213 | // ... | 213 | // ... |
214 | } | 214 | } |
215 | } | 215 | } |
@@ -226,7 +226,7 @@ fn foo(n: usize) { | |||
226 | // the ast::MacroCall to include the semicolon at the end | 226 | // the ast::MacroCall to include the semicolon at the end |
227 | check_assist( | 227 | check_assist( |
228 | remove_dbg, | 228 | remove_dbg, |
229 | r#"let res = <|>dbg!(1 * 20); // needless comment"#, | 229 | r#"let res = $0dbg!(1 * 20); // needless comment"#, |
230 | r#"let res = 1 * 20; // needless comment"#, | 230 | r#"let res = 1 * 20; // needless comment"#, |
231 | ); | 231 | ); |
232 | } | 232 | } |
@@ -238,7 +238,7 @@ fn foo(n: usize) { | |||
238 | " | 238 | " |
239 | fn main() { | 239 | fn main() { |
240 | let mut a = 1; | 240 | let mut a = 1; |
241 | while dbg!<|>(a) < 10000 { | 241 | while dbg!$0(a) < 10000 { |
242 | a += 1; | 242 | a += 1; |
243 | } | 243 | } |
244 | } | 244 | } |
@@ -258,31 +258,31 @@ fn main() { | |||
258 | fn test_remove_dbg_keep_expression() { | 258 | fn test_remove_dbg_keep_expression() { |
259 | check_assist( | 259 | check_assist( |
260 | remove_dbg, | 260 | remove_dbg, |
261 | r#"let res = <|>dbg!(a + b).foo();"#, | 261 | r#"let res = $0dbg!(a + b).foo();"#, |
262 | r#"let res = (a + b).foo();"#, | 262 | r#"let res = (a + b).foo();"#, |
263 | ); | 263 | ); |
264 | 264 | ||
265 | check_assist(remove_dbg, r#"let res = <|>dbg!(2 + 2) * 5"#, r#"let res = (2 + 2) * 5"#); | 265 | check_assist(remove_dbg, r#"let res = $0dbg!(2 + 2) * 5"#, r#"let res = (2 + 2) * 5"#); |
266 | check_assist(remove_dbg, r#"let res = <|>dbg![2 + 2] * 5"#, r#"let res = (2 + 2) * 5"#); | 266 | check_assist(remove_dbg, r#"let res = $0dbg![2 + 2] * 5"#, r#"let res = (2 + 2) * 5"#); |
267 | } | 267 | } |
268 | 268 | ||
269 | #[test] | 269 | #[test] |
270 | fn test_remove_dbg_method_chaining() { | 270 | fn test_remove_dbg_method_chaining() { |
271 | check_assist( | 271 | check_assist( |
272 | remove_dbg, | 272 | remove_dbg, |
273 | r#"let res = <|>dbg!(foo().bar()).baz();"#, | 273 | r#"let res = $0dbg!(foo().bar()).baz();"#, |
274 | r#"let res = foo().bar().baz();"#, | 274 | r#"let res = foo().bar().baz();"#, |
275 | ); | 275 | ); |
276 | check_assist( | 276 | check_assist( |
277 | remove_dbg, | 277 | remove_dbg, |
278 | r#"let res = <|>dbg!(foo.bar()).baz();"#, | 278 | r#"let res = $0dbg!(foo.bar()).baz();"#, |
279 | r#"let res = foo.bar().baz();"#, | 279 | r#"let res = foo.bar().baz();"#, |
280 | ); | 280 | ); |
281 | } | 281 | } |
282 | 282 | ||
283 | #[test] | 283 | #[test] |
284 | fn test_remove_dbg_field_chaining() { | 284 | fn test_remove_dbg_field_chaining() { |
285 | check_assist(remove_dbg, r#"let res = <|>dbg!(foo.bar).baz;"#, r#"let res = foo.bar.baz;"#); | 285 | check_assist(remove_dbg, r#"let res = $0dbg!(foo.bar).baz;"#, r#"let res = foo.bar.baz;"#); |
286 | } | 286 | } |
287 | 287 | ||
288 | #[test] | 288 | #[test] |
@@ -295,7 +295,7 @@ fn square(x: u32) -> u32 { | |||
295 | } | 295 | } |
296 | 296 | ||
297 | fn main() { | 297 | fn main() { |
298 | let x = square(dbg<|>!(5 + 10)); | 298 | let x = square(dbg$0!(5 + 10)); |
299 | println!("{}", x); | 299 | println!("{}", x); |
300 | }"#, | 300 | }"#, |
301 | "dbg!(5 + 10)", | 301 | "dbg!(5 + 10)", |
@@ -309,7 +309,7 @@ fn square(x: u32) -> u32 { | |||
309 | } | 309 | } |
310 | 310 | ||
311 | fn main() { | 311 | fn main() { |
312 | let x = square(dbg<|>!(5 + 10)); | 312 | let x = square(dbg$0!(5 + 10)); |
313 | println!("{}", x); | 313 | println!("{}", x); |
314 | }"#, | 314 | }"#, |
315 | r#" | 315 | r#" |
@@ -328,7 +328,7 @@ fn main() { | |||
328 | fn test_remove_dbg_try_expr() { | 328 | fn test_remove_dbg_try_expr() { |
329 | check_assist( | 329 | check_assist( |
330 | remove_dbg, | 330 | remove_dbg, |
331 | r#"let res = <|>dbg!(result?).foo();"#, | 331 | r#"let res = $0dbg!(result?).foo();"#, |
332 | r#"let res = result?.foo();"#, | 332 | r#"let res = result?.foo();"#, |
333 | ); | 333 | ); |
334 | } | 334 | } |
@@ -337,7 +337,7 @@ fn main() { | |||
337 | fn test_remove_dbg_await_expr() { | 337 | fn test_remove_dbg_await_expr() { |
338 | check_assist( | 338 | check_assist( |
339 | remove_dbg, | 339 | remove_dbg, |
340 | r#"let res = <|>dbg!(fut.await).foo();"#, | 340 | r#"let res = $0dbg!(fut.await).foo();"#, |
341 | r#"let res = fut.await.foo();"#, | 341 | r#"let res = fut.await.foo();"#, |
342 | ); | 342 | ); |
343 | } | 343 | } |
@@ -346,7 +346,7 @@ fn main() { | |||
346 | fn test_remove_dbg_as_cast() { | 346 | fn test_remove_dbg_as_cast() { |
347 | check_assist( | 347 | check_assist( |
348 | remove_dbg, | 348 | remove_dbg, |
349 | r#"let res = <|>dbg!(3 as usize).foo();"#, | 349 | r#"let res = $0dbg!(3 as usize).foo();"#, |
350 | r#"let res = (3 as usize).foo();"#, | 350 | r#"let res = (3 as usize).foo();"#, |
351 | ); | 351 | ); |
352 | } | 352 | } |
@@ -355,12 +355,12 @@ fn main() { | |||
355 | fn test_remove_dbg_index_expr() { | 355 | fn test_remove_dbg_index_expr() { |
356 | check_assist( | 356 | check_assist( |
357 | remove_dbg, | 357 | remove_dbg, |
358 | r#"let res = <|>dbg!(array[3]).foo();"#, | 358 | r#"let res = $0dbg!(array[3]).foo();"#, |
359 | r#"let res = array[3].foo();"#, | 359 | r#"let res = array[3].foo();"#, |
360 | ); | 360 | ); |
361 | check_assist( | 361 | check_assist( |
362 | remove_dbg, | 362 | remove_dbg, |
363 | r#"let res = <|>dbg!(tuple.3).foo();"#, | 363 | r#"let res = $0dbg!(tuple.3).foo();"#, |
364 | r#"let res = tuple.3.foo();"#, | 364 | r#"let res = tuple.3.foo();"#, |
365 | ); | 365 | ); |
366 | } | 366 | } |
@@ -369,12 +369,12 @@ fn main() { | |||
369 | fn test_remove_dbg_range_expr() { | 369 | fn test_remove_dbg_range_expr() { |
370 | check_assist( | 370 | check_assist( |
371 | remove_dbg, | 371 | remove_dbg, |
372 | r#"let res = <|>dbg!(foo..bar).foo();"#, | 372 | r#"let res = $0dbg!(foo..bar).foo();"#, |
373 | r#"let res = (foo..bar).foo();"#, | 373 | r#"let res = (foo..bar).foo();"#, |
374 | ); | 374 | ); |
375 | check_assist( | 375 | check_assist( |
376 | remove_dbg, | 376 | remove_dbg, |
377 | r#"let res = <|>dbg!(foo..=bar).foo();"#, | 377 | r#"let res = $0dbg!(foo..=bar).foo();"#, |
378 | r#"let res = (foo..=bar).foo();"#, | 378 | r#"let res = (foo..=bar).foo();"#, |
379 | ); | 379 | ); |
380 | } | 380 | } |
@@ -384,7 +384,7 @@ fn main() { | |||
384 | check_assist( | 384 | check_assist( |
385 | remove_dbg, | 385 | remove_dbg, |
386 | r#"fn foo() { | 386 | r#"fn foo() { |
387 | if <|>dbg!(x || y) {} | 387 | if $0dbg!(x || y) {} |
388 | }"#, | 388 | }"#, |
389 | r#"fn foo() { | 389 | r#"fn foo() { |
390 | if x || y {} | 390 | if x || y {} |
@@ -393,7 +393,7 @@ fn main() { | |||
393 | check_assist( | 393 | check_assist( |
394 | remove_dbg, | 394 | remove_dbg, |
395 | r#"fn foo() { | 395 | r#"fn foo() { |
396 | while let foo = <|>dbg!(&x) {} | 396 | while let foo = $0dbg!(&x) {} |
397 | }"#, | 397 | }"#, |
398 | r#"fn foo() { | 398 | r#"fn foo() { |
399 | while let foo = &x {} | 399 | while let foo = &x {} |
@@ -402,7 +402,7 @@ fn main() { | |||
402 | check_assist( | 402 | check_assist( |
403 | remove_dbg, | 403 | remove_dbg, |
404 | r#"fn foo() { | 404 | r#"fn foo() { |
405 | if let foo = <|>dbg!(&x) {} | 405 | if let foo = $0dbg!(&x) {} |
406 | }"#, | 406 | }"#, |
407 | r#"fn foo() { | 407 | r#"fn foo() { |
408 | if let foo = &x {} | 408 | if let foo = &x {} |
@@ -411,7 +411,7 @@ fn main() { | |||
411 | check_assist( | 411 | check_assist( |
412 | remove_dbg, | 412 | remove_dbg, |
413 | r#"fn foo() { | 413 | r#"fn foo() { |
414 | match <|>dbg!(&x) {} | 414 | match $0dbg!(&x) {} |
415 | }"#, | 415 | }"#, |
416 | r#"fn foo() { | 416 | r#"fn foo() { |
417 | match &x {} | 417 | match &x {} |