diff options
Diffstat (limited to 'crates/assists/src/handlers/raw_string.rs')
-rw-r--r-- | crates/assists/src/handlers/raw_string.rs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/crates/assists/src/handlers/raw_string.rs b/crates/assists/src/handlers/raw_string.rs index 4c759cc25..be963f162 100644 --- a/crates/assists/src/handlers/raw_string.rs +++ b/crates/assists/src/handlers/raw_string.rs | |||
@@ -11,7 +11,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists}; | |||
11 | // | 11 | // |
12 | // ``` | 12 | // ``` |
13 | // fn main() { | 13 | // fn main() { |
14 | // "Hello,<|> World!"; | 14 | // "Hello,$0 World!"; |
15 | // } | 15 | // } |
16 | // ``` | 16 | // ``` |
17 | // -> | 17 | // -> |
@@ -53,7 +53,7 @@ pub(crate) fn make_raw_string(acc: &mut Assists, ctx: &AssistContext) -> Option< | |||
53 | // | 53 | // |
54 | // ``` | 54 | // ``` |
55 | // fn main() { | 55 | // fn main() { |
56 | // r#"Hello,<|> "World!""#; | 56 | // r#"Hello,$0 "World!""#; |
57 | // } | 57 | // } |
58 | // ``` | 58 | // ``` |
59 | // -> | 59 | // -> |
@@ -95,7 +95,7 @@ pub(crate) fn make_usual_string(acc: &mut Assists, ctx: &AssistContext) -> Optio | |||
95 | // | 95 | // |
96 | // ``` | 96 | // ``` |
97 | // fn main() { | 97 | // fn main() { |
98 | // r#"Hello,<|> World!"#; | 98 | // r#"Hello,$0 World!"#; |
99 | // } | 99 | // } |
100 | // ``` | 100 | // ``` |
101 | // -> | 101 | // -> |
@@ -123,7 +123,7 @@ pub(crate) fn add_hash(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { | |||
123 | // | 123 | // |
124 | // ``` | 124 | // ``` |
125 | // fn main() { | 125 | // fn main() { |
126 | // r#"Hello,<|> World!"#; | 126 | // r#"Hello,$0 World!"#; |
127 | // } | 127 | // } |
128 | // ``` | 128 | // ``` |
129 | // -> | 129 | // -> |
@@ -194,7 +194,7 @@ mod tests { | |||
194 | make_raw_string, | 194 | make_raw_string, |
195 | r#" | 195 | r#" |
196 | fn f() { | 196 | fn f() { |
197 | let s = <|>"random\nstring"; | 197 | let s = $0"random\nstring"; |
198 | } | 198 | } |
199 | "#, | 199 | "#, |
200 | r#""random\nstring""#, | 200 | r#""random\nstring""#, |
@@ -207,7 +207,7 @@ mod tests { | |||
207 | make_raw_string, | 207 | make_raw_string, |
208 | r#" | 208 | r#" |
209 | fn f() { | 209 | fn f() { |
210 | let s = <|>"random\nstring"; | 210 | let s = $0"random\nstring"; |
211 | } | 211 | } |
212 | "#, | 212 | "#, |
213 | r##" | 213 | r##" |
@@ -225,7 +225,7 @@ string"#; | |||
225 | make_raw_string, | 225 | make_raw_string, |
226 | r#" | 226 | r#" |
227 | fn f() { | 227 | fn f() { |
228 | format!(<|>"x = {}", 92) | 228 | format!($0"x = {}", 92) |
229 | } | 229 | } |
230 | "#, | 230 | "#, |
231 | r##" | 231 | r##" |
@@ -242,7 +242,7 @@ string"#; | |||
242 | make_raw_string, | 242 | make_raw_string, |
243 | r###" | 243 | r###" |
244 | fn f() { | 244 | fn f() { |
245 | let s = <|>"#random##\nstring"; | 245 | let s = $0"#random##\nstring"; |
246 | } | 246 | } |
247 | "###, | 247 | "###, |
248 | r####" | 248 | r####" |
@@ -260,7 +260,7 @@ string"#; | |||
260 | make_raw_string, | 260 | make_raw_string, |
261 | r###" | 261 | r###" |
262 | fn f() { | 262 | fn f() { |
263 | let s = <|>"#random\"##\nstring"; | 263 | let s = $0"#random\"##\nstring"; |
264 | } | 264 | } |
265 | "###, | 265 | "###, |
266 | r####" | 266 | r####" |
@@ -278,7 +278,7 @@ string"###; | |||
278 | make_raw_string, | 278 | make_raw_string, |
279 | r#" | 279 | r#" |
280 | fn f() { | 280 | fn f() { |
281 | let s = <|>"random string"; | 281 | let s = $0"random string"; |
282 | } | 282 | } |
283 | "#, | 283 | "#, |
284 | r##" | 284 | r##" |
@@ -295,7 +295,7 @@ string"###; | |||
295 | make_raw_string, | 295 | make_raw_string, |
296 | r#" | 296 | r#" |
297 | fn f() { | 297 | fn f() { |
298 | let s = "foo<|> | 298 | let s = "foo$0 |
299 | } | 299 | } |
300 | "#, | 300 | "#, |
301 | ) | 301 | ) |
@@ -307,7 +307,7 @@ string"###; | |||
307 | make_usual_string, | 307 | make_usual_string, |
308 | r#" | 308 | r#" |
309 | fn main() { | 309 | fn main() { |
310 | let s = r#"bar<|> | 310 | let s = r#"bar$0 |
311 | } | 311 | } |
312 | "#, | 312 | "#, |
313 | ) | 313 | ) |
@@ -319,7 +319,7 @@ string"###; | |||
319 | add_hash, | 319 | add_hash, |
320 | r#" | 320 | r#" |
321 | fn f() { | 321 | fn f() { |
322 | let s = <|>r"random string"; | 322 | let s = $0r"random string"; |
323 | } | 323 | } |
324 | "#, | 324 | "#, |
325 | r#"r"random string""#, | 325 | r#"r"random string""#, |
@@ -332,7 +332,7 @@ string"###; | |||
332 | add_hash, | 332 | add_hash, |
333 | r#" | 333 | r#" |
334 | fn f() { | 334 | fn f() { |
335 | let s = <|>r"random string"; | 335 | let s = $0r"random string"; |
336 | } | 336 | } |
337 | "#, | 337 | "#, |
338 | r##" | 338 | r##" |
@@ -349,7 +349,7 @@ string"###; | |||
349 | add_hash, | 349 | add_hash, |
350 | r##" | 350 | r##" |
351 | fn f() { | 351 | fn f() { |
352 | let s = <|>r#"random"string"#; | 352 | let s = $0r#"random"string"#; |
353 | } | 353 | } |
354 | "##, | 354 | "##, |
355 | r###" | 355 | r###" |
@@ -366,7 +366,7 @@ string"###; | |||
366 | add_hash, | 366 | add_hash, |
367 | r#" | 367 | r#" |
368 | fn f() { | 368 | fn f() { |
369 | let s = <|>"random string"; | 369 | let s = $0"random string"; |
370 | } | 370 | } |
371 | "#, | 371 | "#, |
372 | ); | 372 | ); |
@@ -378,7 +378,7 @@ string"###; | |||
378 | remove_hash, | 378 | remove_hash, |
379 | r##" | 379 | r##" |
380 | fn f() { | 380 | fn f() { |
381 | let s = <|>r#"random string"#; | 381 | let s = $0r#"random string"#; |
382 | } | 382 | } |
383 | "##, | 383 | "##, |
384 | r##"r#"random string"#"##, | 384 | r##"r#"random string"#"##, |
@@ -389,7 +389,7 @@ string"###; | |||
389 | fn remove_hash_works() { | 389 | fn remove_hash_works() { |
390 | check_assist( | 390 | check_assist( |
391 | remove_hash, | 391 | remove_hash, |
392 | r##"fn f() { let s = <|>r#"random string"#; }"##, | 392 | r##"fn f() { let s = $0r#"random string"#; }"##, |
393 | r#"fn f() { let s = r"random string"; }"#, | 393 | r#"fn f() { let s = r"random string"; }"#, |
394 | ) | 394 | ) |
395 | } | 395 | } |
@@ -401,7 +401,7 @@ string"###; | |||
401 | remove_hash, | 401 | remove_hash, |
402 | r##" | 402 | r##" |
403 | fn f() { | 403 | fn f() { |
404 | let s = <|>r#"random"str"ing"#; | 404 | let s = $0r#"random"str"ing"#; |
405 | } | 405 | } |
406 | "##, | 406 | "##, |
407 | ) | 407 | ) |
@@ -413,7 +413,7 @@ string"###; | |||
413 | remove_hash, | 413 | remove_hash, |
414 | r###" | 414 | r###" |
415 | fn f() { | 415 | fn f() { |
416 | let s = <|>r##"random string"##; | 416 | let s = $0r##"random string"##; |
417 | } | 417 | } |
418 | "###, | 418 | "###, |
419 | r##" | 419 | r##" |
@@ -426,12 +426,12 @@ string"###; | |||
426 | 426 | ||
427 | #[test] | 427 | #[test] |
428 | fn remove_hash_doesnt_work() { | 428 | fn remove_hash_doesnt_work() { |
429 | check_assist_not_applicable(remove_hash, r#"fn f() { let s = <|>"random string"; }"#); | 429 | check_assist_not_applicable(remove_hash, r#"fn f() { let s = $0"random string"; }"#); |
430 | } | 430 | } |
431 | 431 | ||
432 | #[test] | 432 | #[test] |
433 | fn remove_hash_no_hash_doesnt_work() { | 433 | fn remove_hash_no_hash_doesnt_work() { |
434 | check_assist_not_applicable(remove_hash, r#"fn f() { let s = <|>r"random string"; }"#); | 434 | check_assist_not_applicable(remove_hash, r#"fn f() { let s = $0r"random string"; }"#); |
435 | } | 435 | } |
436 | 436 | ||
437 | #[test] | 437 | #[test] |
@@ -440,7 +440,7 @@ string"###; | |||
440 | make_usual_string, | 440 | make_usual_string, |
441 | r##" | 441 | r##" |
442 | fn f() { | 442 | fn f() { |
443 | let s = <|>r#"random string"#; | 443 | let s = $0r#"random string"#; |
444 | } | 444 | } |
445 | "##, | 445 | "##, |
446 | r##"r#"random string"#"##, | 446 | r##"r#"random string"#"##, |
@@ -453,7 +453,7 @@ string"###; | |||
453 | make_usual_string, | 453 | make_usual_string, |
454 | r##" | 454 | r##" |
455 | fn f() { | 455 | fn f() { |
456 | let s = <|>r#"random string"#; | 456 | let s = $0r#"random string"#; |
457 | } | 457 | } |
458 | "##, | 458 | "##, |
459 | r#" | 459 | r#" |
@@ -470,7 +470,7 @@ string"###; | |||
470 | make_usual_string, | 470 | make_usual_string, |
471 | r##" | 471 | r##" |
472 | fn f() { | 472 | fn f() { |
473 | let s = <|>r#"random"str"ing"#; | 473 | let s = $0r#"random"str"ing"#; |
474 | } | 474 | } |
475 | "##, | 475 | "##, |
476 | r#" | 476 | r#" |
@@ -487,7 +487,7 @@ string"###; | |||
487 | make_usual_string, | 487 | make_usual_string, |
488 | r###" | 488 | r###" |
489 | fn f() { | 489 | fn f() { |
490 | let s = <|>r##"random string"##; | 490 | let s = $0r##"random string"##; |
491 | } | 491 | } |
492 | "###, | 492 | "###, |
493 | r##" | 493 | r##" |
@@ -504,7 +504,7 @@ string"###; | |||
504 | make_usual_string, | 504 | make_usual_string, |
505 | r#" | 505 | r#" |
506 | fn f() { | 506 | fn f() { |
507 | let s = <|>"random string"; | 507 | let s = $0"random string"; |
508 | } | 508 | } |
509 | "#, | 509 | "#, |
510 | ); | 510 | ); |