diff options
Diffstat (limited to 'crates/assists/src/handlers/fix_visibility.rs')
-rw-r--r-- | crates/assists/src/handlers/fix_visibility.rs | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/crates/assists/src/handlers/fix_visibility.rs b/crates/assists/src/handlers/fix_visibility.rs index c10b3b8f5..6c7824e55 100644 --- a/crates/assists/src/handlers/fix_visibility.rs +++ b/crates/assists/src/handlers/fix_visibility.rs | |||
@@ -18,7 +18,7 @@ use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists}; | |||
18 | // fn frobnicate() {} | 18 | // fn frobnicate() {} |
19 | // } | 19 | // } |
20 | // fn main() { | 20 | // fn main() { |
21 | // m::frobnicate<|>() {} | 21 | // m::frobnicate$0() {} |
22 | // } | 22 | // } |
23 | // ``` | 23 | // ``` |
24 | // -> | 24 | // -> |
@@ -218,14 +218,14 @@ mod tests { | |||
218 | check_assist( | 218 | check_assist( |
219 | fix_visibility, | 219 | fix_visibility, |
220 | r"mod foo { fn foo() {} } | 220 | r"mod foo { fn foo() {} } |
221 | fn main() { foo::foo<|>() } ", | 221 | fn main() { foo::foo$0() } ", |
222 | r"mod foo { $0pub(crate) fn foo() {} } | 222 | r"mod foo { $0pub(crate) fn foo() {} } |
223 | fn main() { foo::foo() } ", | 223 | fn main() { foo::foo() } ", |
224 | ); | 224 | ); |
225 | check_assist_not_applicable( | 225 | check_assist_not_applicable( |
226 | fix_visibility, | 226 | fix_visibility, |
227 | r"mod foo { pub fn foo() {} } | 227 | r"mod foo { pub fn foo() {} } |
228 | fn main() { foo::foo<|>() } ", | 228 | fn main() { foo::foo$0() } ", |
229 | ) | 229 | ) |
230 | } | 230 | } |
231 | 231 | ||
@@ -234,38 +234,38 @@ mod tests { | |||
234 | check_assist( | 234 | check_assist( |
235 | fix_visibility, | 235 | fix_visibility, |
236 | r"mod foo { struct Foo; } | 236 | r"mod foo { struct Foo; } |
237 | fn main() { foo::Foo<|> } ", | 237 | fn main() { foo::Foo$0 } ", |
238 | r"mod foo { $0pub(crate) struct Foo; } | 238 | r"mod foo { $0pub(crate) struct Foo; } |
239 | fn main() { foo::Foo } ", | 239 | fn main() { foo::Foo } ", |
240 | ); | 240 | ); |
241 | check_assist_not_applicable( | 241 | check_assist_not_applicable( |
242 | fix_visibility, | 242 | fix_visibility, |
243 | r"mod foo { pub struct Foo; } | 243 | r"mod foo { pub struct Foo; } |
244 | fn main() { foo::Foo<|> } ", | 244 | fn main() { foo::Foo$0 } ", |
245 | ); | 245 | ); |
246 | check_assist( | 246 | check_assist( |
247 | fix_visibility, | 247 | fix_visibility, |
248 | r"mod foo { enum Foo; } | 248 | r"mod foo { enum Foo; } |
249 | fn main() { foo::Foo<|> } ", | 249 | fn main() { foo::Foo$0 } ", |
250 | r"mod foo { $0pub(crate) enum Foo; } | 250 | r"mod foo { $0pub(crate) enum Foo; } |
251 | fn main() { foo::Foo } ", | 251 | fn main() { foo::Foo } ", |
252 | ); | 252 | ); |
253 | check_assist_not_applicable( | 253 | check_assist_not_applicable( |
254 | fix_visibility, | 254 | fix_visibility, |
255 | r"mod foo { pub enum Foo; } | 255 | r"mod foo { pub enum Foo; } |
256 | fn main() { foo::Foo<|> } ", | 256 | fn main() { foo::Foo$0 } ", |
257 | ); | 257 | ); |
258 | check_assist( | 258 | check_assist( |
259 | fix_visibility, | 259 | fix_visibility, |
260 | r"mod foo { union Foo; } | 260 | r"mod foo { union Foo; } |
261 | fn main() { foo::Foo<|> } ", | 261 | fn main() { foo::Foo$0 } ", |
262 | r"mod foo { $0pub(crate) union Foo; } | 262 | r"mod foo { $0pub(crate) union Foo; } |
263 | fn main() { foo::Foo } ", | 263 | fn main() { foo::Foo } ", |
264 | ); | 264 | ); |
265 | check_assist_not_applicable( | 265 | check_assist_not_applicable( |
266 | fix_visibility, | 266 | fix_visibility, |
267 | r"mod foo { pub union Foo; } | 267 | r"mod foo { pub union Foo; } |
268 | fn main() { foo::Foo<|> } ", | 268 | fn main() { foo::Foo$0 } ", |
269 | ); | 269 | ); |
270 | } | 270 | } |
271 | 271 | ||
@@ -276,7 +276,7 @@ mod tests { | |||
276 | r" | 276 | r" |
277 | //- /main.rs | 277 | //- /main.rs |
278 | mod foo; | 278 | mod foo; |
279 | fn main() { foo::Foo<|> } | 279 | fn main() { foo::Foo$0 } |
280 | 280 | ||
281 | //- /foo.rs | 281 | //- /foo.rs |
282 | struct Foo; | 282 | struct Foo; |
@@ -291,7 +291,7 @@ struct Foo; | |||
291 | check_assist( | 291 | check_assist( |
292 | fix_visibility, | 292 | fix_visibility, |
293 | r"mod foo { pub struct Foo { bar: (), } } | 293 | r"mod foo { pub struct Foo { bar: (), } } |
294 | fn main() { foo::Foo { <|>bar: () }; } ", | 294 | fn main() { foo::Foo { $0bar: () }; } ", |
295 | r"mod foo { pub struct Foo { $0pub(crate) bar: (), } } | 295 | r"mod foo { pub struct Foo { $0pub(crate) bar: (), } } |
296 | fn main() { foo::Foo { bar: () }; } ", | 296 | fn main() { foo::Foo { bar: () }; } ", |
297 | ); | 297 | ); |
@@ -300,7 +300,7 @@ struct Foo; | |||
300 | r" | 300 | r" |
301 | //- /lib.rs | 301 | //- /lib.rs |
302 | mod foo; | 302 | mod foo; |
303 | fn main() { foo::Foo { <|>bar: () }; } | 303 | fn main() { foo::Foo { $0bar: () }; } |
304 | //- /foo.rs | 304 | //- /foo.rs |
305 | pub struct Foo { bar: () } | 305 | pub struct Foo { bar: () } |
306 | ", | 306 | ", |
@@ -310,14 +310,14 @@ pub struct Foo { bar: () } | |||
310 | check_assist_not_applicable( | 310 | check_assist_not_applicable( |
311 | fix_visibility, | 311 | fix_visibility, |
312 | r"mod foo { pub struct Foo { pub bar: (), } } | 312 | r"mod foo { pub struct Foo { pub bar: (), } } |
313 | fn main() { foo::Foo { <|>bar: () }; } ", | 313 | fn main() { foo::Foo { $0bar: () }; } ", |
314 | ); | 314 | ); |
315 | check_assist_not_applicable( | 315 | check_assist_not_applicable( |
316 | fix_visibility, | 316 | fix_visibility, |
317 | r" | 317 | r" |
318 | //- /lib.rs | 318 | //- /lib.rs |
319 | mod foo; | 319 | mod foo; |
320 | fn main() { foo::Foo { <|>bar: () }; } | 320 | fn main() { foo::Foo { $0bar: () }; } |
321 | //- /foo.rs | 321 | //- /foo.rs |
322 | pub struct Foo { pub bar: () } | 322 | pub struct Foo { pub bar: () } |
323 | ", | 323 | ", |
@@ -331,14 +331,14 @@ pub struct Foo { pub bar: () } | |||
331 | check_assist_not_applicable( | 331 | check_assist_not_applicable( |
332 | fix_visibility, | 332 | fix_visibility, |
333 | r"mod foo { pub enum Foo { Bar { bar: () } } } | 333 | r"mod foo { pub enum Foo { Bar { bar: () } } } |
334 | fn main() { foo::Foo::Bar { <|>bar: () }; } ", | 334 | fn main() { foo::Foo::Bar { $0bar: () }; } ", |
335 | ); | 335 | ); |
336 | check_assist_not_applicable( | 336 | check_assist_not_applicable( |
337 | fix_visibility, | 337 | fix_visibility, |
338 | r" | 338 | r" |
339 | //- /lib.rs | 339 | //- /lib.rs |
340 | mod foo; | 340 | mod foo; |
341 | fn main() { foo::Foo::Bar { <|>bar: () }; } | 341 | fn main() { foo::Foo::Bar { $0bar: () }; } |
342 | //- /foo.rs | 342 | //- /foo.rs |
343 | pub enum Foo { Bar { bar: () } } | 343 | pub enum Foo { Bar { bar: () } } |
344 | ", | 344 | ", |
@@ -346,14 +346,14 @@ pub enum Foo { Bar { bar: () } } | |||
346 | check_assist_not_applicable( | 346 | check_assist_not_applicable( |
347 | fix_visibility, | 347 | fix_visibility, |
348 | r"mod foo { pub struct Foo { pub bar: (), } } | 348 | r"mod foo { pub struct Foo { pub bar: (), } } |
349 | fn main() { foo::Foo { <|>bar: () }; } ", | 349 | fn main() { foo::Foo { $0bar: () }; } ", |
350 | ); | 350 | ); |
351 | check_assist_not_applicable( | 351 | check_assist_not_applicable( |
352 | fix_visibility, | 352 | fix_visibility, |
353 | r" | 353 | r" |
354 | //- /lib.rs | 354 | //- /lib.rs |
355 | mod foo; | 355 | mod foo; |
356 | fn main() { foo::Foo { <|>bar: () }; } | 356 | fn main() { foo::Foo { $0bar: () }; } |
357 | //- /foo.rs | 357 | //- /foo.rs |
358 | pub struct Foo { pub bar: () } | 358 | pub struct Foo { pub bar: () } |
359 | ", | 359 | ", |
@@ -367,7 +367,7 @@ pub struct Foo { pub bar: () } | |||
367 | check_assist( | 367 | check_assist( |
368 | fix_visibility, | 368 | fix_visibility, |
369 | r"mod foo { pub union Foo { bar: (), } } | 369 | r"mod foo { pub union Foo { bar: (), } } |
370 | fn main() { foo::Foo { <|>bar: () }; } ", | 370 | fn main() { foo::Foo { $0bar: () }; } ", |
371 | r"mod foo { pub union Foo { $0pub(crate) bar: (), } } | 371 | r"mod foo { pub union Foo { $0pub(crate) bar: (), } } |
372 | fn main() { foo::Foo { bar: () }; } ", | 372 | fn main() { foo::Foo { bar: () }; } ", |
373 | ); | 373 | ); |
@@ -376,7 +376,7 @@ pub struct Foo { pub bar: () } | |||
376 | r" | 376 | r" |
377 | //- /lib.rs | 377 | //- /lib.rs |
378 | mod foo; | 378 | mod foo; |
379 | fn main() { foo::Foo { <|>bar: () }; } | 379 | fn main() { foo::Foo { $0bar: () }; } |
380 | //- /foo.rs | 380 | //- /foo.rs |
381 | pub union Foo { bar: () } | 381 | pub union Foo { bar: () } |
382 | ", | 382 | ", |
@@ -386,14 +386,14 @@ pub union Foo { bar: () } | |||
386 | check_assist_not_applicable( | 386 | check_assist_not_applicable( |
387 | fix_visibility, | 387 | fix_visibility, |
388 | r"mod foo { pub union Foo { pub bar: (), } } | 388 | r"mod foo { pub union Foo { pub bar: (), } } |
389 | fn main() { foo::Foo { <|>bar: () }; } ", | 389 | fn main() { foo::Foo { $0bar: () }; } ", |
390 | ); | 390 | ); |
391 | check_assist_not_applicable( | 391 | check_assist_not_applicable( |
392 | fix_visibility, | 392 | fix_visibility, |
393 | r" | 393 | r" |
394 | //- /lib.rs | 394 | //- /lib.rs |
395 | mod foo; | 395 | mod foo; |
396 | fn main() { foo::Foo { <|>bar: () }; } | 396 | fn main() { foo::Foo { $0bar: () }; } |
397 | //- /foo.rs | 397 | //- /foo.rs |
398 | pub union Foo { pub bar: () } | 398 | pub union Foo { pub bar: () } |
399 | ", | 399 | ", |
@@ -405,14 +405,14 @@ pub union Foo { pub bar: () } | |||
405 | check_assist( | 405 | check_assist( |
406 | fix_visibility, | 406 | fix_visibility, |
407 | r"mod foo { const FOO: () = (); } | 407 | r"mod foo { const FOO: () = (); } |
408 | fn main() { foo::FOO<|> } ", | 408 | fn main() { foo::FOO$0 } ", |
409 | r"mod foo { $0pub(crate) const FOO: () = (); } | 409 | r"mod foo { $0pub(crate) const FOO: () = (); } |
410 | fn main() { foo::FOO } ", | 410 | fn main() { foo::FOO } ", |
411 | ); | 411 | ); |
412 | check_assist_not_applicable( | 412 | check_assist_not_applicable( |
413 | fix_visibility, | 413 | fix_visibility, |
414 | r"mod foo { pub const FOO: () = (); } | 414 | r"mod foo { pub const FOO: () = (); } |
415 | fn main() { foo::FOO<|> } ", | 415 | fn main() { foo::FOO$0 } ", |
416 | ); | 416 | ); |
417 | } | 417 | } |
418 | 418 | ||
@@ -421,14 +421,14 @@ pub union Foo { pub bar: () } | |||
421 | check_assist( | 421 | check_assist( |
422 | fix_visibility, | 422 | fix_visibility, |
423 | r"mod foo { static FOO: () = (); } | 423 | r"mod foo { static FOO: () = (); } |
424 | fn main() { foo::FOO<|> } ", | 424 | fn main() { foo::FOO$0 } ", |
425 | r"mod foo { $0pub(crate) static FOO: () = (); } | 425 | r"mod foo { $0pub(crate) static FOO: () = (); } |
426 | fn main() { foo::FOO } ", | 426 | fn main() { foo::FOO } ", |
427 | ); | 427 | ); |
428 | check_assist_not_applicable( | 428 | check_assist_not_applicable( |
429 | fix_visibility, | 429 | fix_visibility, |
430 | r"mod foo { pub static FOO: () = (); } | 430 | r"mod foo { pub static FOO: () = (); } |
431 | fn main() { foo::FOO<|> } ", | 431 | fn main() { foo::FOO$0 } ", |
432 | ); | 432 | ); |
433 | } | 433 | } |
434 | 434 | ||
@@ -437,14 +437,14 @@ pub union Foo { pub bar: () } | |||
437 | check_assist( | 437 | check_assist( |
438 | fix_visibility, | 438 | fix_visibility, |
439 | r"mod foo { trait Foo { fn foo(&self) {} } } | 439 | r"mod foo { trait Foo { fn foo(&self) {} } } |
440 | fn main() { let x: &dyn foo::<|>Foo; } ", | 440 | fn main() { let x: &dyn foo::$0Foo; } ", |
441 | r"mod foo { $0pub(crate) trait Foo { fn foo(&self) {} } } | 441 | r"mod foo { $0pub(crate) trait Foo { fn foo(&self) {} } } |
442 | fn main() { let x: &dyn foo::Foo; } ", | 442 | fn main() { let x: &dyn foo::Foo; } ", |
443 | ); | 443 | ); |
444 | check_assist_not_applicable( | 444 | check_assist_not_applicable( |
445 | fix_visibility, | 445 | fix_visibility, |
446 | r"mod foo { pub trait Foo { fn foo(&self) {} } } | 446 | r"mod foo { pub trait Foo { fn foo(&self) {} } } |
447 | fn main() { let x: &dyn foo::Foo<|>; } ", | 447 | fn main() { let x: &dyn foo::Foo$0; } ", |
448 | ); | 448 | ); |
449 | } | 449 | } |
450 | 450 | ||
@@ -453,14 +453,14 @@ pub union Foo { pub bar: () } | |||
453 | check_assist( | 453 | check_assist( |
454 | fix_visibility, | 454 | fix_visibility, |
455 | r"mod foo { type Foo = (); } | 455 | r"mod foo { type Foo = (); } |
456 | fn main() { let x: foo::Foo<|>; } ", | 456 | fn main() { let x: foo::Foo$0; } ", |
457 | r"mod foo { $0pub(crate) type Foo = (); } | 457 | r"mod foo { $0pub(crate) type Foo = (); } |
458 | fn main() { let x: foo::Foo; } ", | 458 | fn main() { let x: foo::Foo; } ", |
459 | ); | 459 | ); |
460 | check_assist_not_applicable( | 460 | check_assist_not_applicable( |
461 | fix_visibility, | 461 | fix_visibility, |
462 | r"mod foo { pub type Foo = (); } | 462 | r"mod foo { pub type Foo = (); } |
463 | fn main() { let x: foo::Foo<|>; } ", | 463 | fn main() { let x: foo::Foo$0; } ", |
464 | ); | 464 | ); |
465 | } | 465 | } |
466 | 466 | ||
@@ -469,7 +469,7 @@ pub union Foo { pub bar: () } | |||
469 | check_assist( | 469 | check_assist( |
470 | fix_visibility, | 470 | fix_visibility, |
471 | r"mod foo { mod bar { fn bar() {} } } | 471 | r"mod foo { mod bar { fn bar() {} } } |
472 | fn main() { foo::bar<|>::bar(); } ", | 472 | fn main() { foo::bar$0::bar(); } ", |
473 | r"mod foo { $0pub(crate) mod bar { fn bar() {} } } | 473 | r"mod foo { $0pub(crate) mod bar { fn bar() {} } } |
474 | fn main() { foo::bar::bar(); } ", | 474 | fn main() { foo::bar::bar(); } ", |
475 | ); | 475 | ); |
@@ -479,7 +479,7 @@ pub union Foo { pub bar: () } | |||
479 | r" | 479 | r" |
480 | //- /main.rs | 480 | //- /main.rs |
481 | mod foo; | 481 | mod foo; |
482 | fn main() { foo::bar<|>::baz(); } | 482 | fn main() { foo::bar$0::baz(); } |
483 | 483 | ||
484 | //- /foo.rs | 484 | //- /foo.rs |
485 | mod bar { | 485 | mod bar { |
@@ -495,7 +495,7 @@ mod bar { | |||
495 | check_assist_not_applicable( | 495 | check_assist_not_applicable( |
496 | fix_visibility, | 496 | fix_visibility, |
497 | r"mod foo { pub mod bar { pub fn bar() {} } } | 497 | r"mod foo { pub mod bar { pub fn bar() {} } } |
498 | fn main() { foo::bar<|>::bar(); } ", | 498 | fn main() { foo::bar$0::bar(); } ", |
499 | ); | 499 | ); |
500 | } | 500 | } |
501 | 501 | ||
@@ -506,7 +506,7 @@ mod bar { | |||
506 | r" | 506 | r" |
507 | //- /main.rs | 507 | //- /main.rs |
508 | mod foo; | 508 | mod foo; |
509 | fn main() { foo::bar<|>::baz(); } | 509 | fn main() { foo::bar$0::baz(); } |
510 | 510 | ||
511 | //- /foo.rs | 511 | //- /foo.rs |
512 | mod bar; | 512 | mod bar; |
@@ -525,7 +525,7 @@ pub fn baz() {} | |||
525 | r" | 525 | r" |
526 | //- /main.rs | 526 | //- /main.rs |
527 | mod foo; | 527 | mod foo; |
528 | fn main() { foo::bar<|>>::baz(); } | 528 | fn main() { foo::bar$0>::baz(); } |
529 | 529 | ||
530 | //- /foo.rs | 530 | //- /foo.rs |
531 | mod bar { | 531 | mod bar { |
@@ -545,7 +545,7 @@ mod bar { | |||
545 | fix_visibility, | 545 | fix_visibility, |
546 | r" | 546 | r" |
547 | //- /main.rs crate:a deps:foo | 547 | //- /main.rs crate:a deps:foo |
548 | foo::Bar<|> | 548 | foo::Bar$0 |
549 | //- /lib.rs crate:foo | 549 | //- /lib.rs crate:foo |
550 | struct Bar; | 550 | struct Bar; |
551 | ", | 551 | ", |
@@ -560,7 +560,7 @@ struct Bar; | |||
560 | fix_visibility, | 560 | fix_visibility, |
561 | r" | 561 | r" |
562 | //- /main.rs crate:a deps:foo | 562 | //- /main.rs crate:a deps:foo |
563 | foo::Bar<|> | 563 | foo::Bar$0 |
564 | //- /lib.rs crate:foo | 564 | //- /lib.rs crate:foo |
565 | pub(crate) struct Bar; | 565 | pub(crate) struct Bar; |
566 | ", | 566 | ", |
@@ -572,7 +572,7 @@ pub(crate) struct Bar; | |||
572 | r" | 572 | r" |
573 | //- /main.rs crate:a deps:foo | 573 | //- /main.rs crate:a deps:foo |
574 | fn main() { | 574 | fn main() { |
575 | foo::Foo { <|>bar: () }; | 575 | foo::Foo { $0bar: () }; |
576 | } | 576 | } |
577 | //- /lib.rs crate:foo | 577 | //- /lib.rs crate:foo |
578 | pub struct Foo { pub(crate) bar: () } | 578 | pub struct Foo { pub(crate) bar: () } |
@@ -593,7 +593,7 @@ pub struct Foo { pub(crate) bar: () } | |||
593 | use bar::Baz; | 593 | use bar::Baz; |
594 | mod bar { pub(super) struct Baz; } | 594 | mod bar { pub(super) struct Baz; } |
595 | } | 595 | } |
596 | foo::Baz<|> | 596 | foo::Baz$0 |
597 | ", | 597 | ", |
598 | r" | 598 | r" |
599 | mod foo { | 599 | mod foo { |