Skip to content

Commit 4c347a9

Browse files
matkladmatklad
committed
Compress rename tests
1 parent 2656c41 commit 4c347a9

File tree

1 file changed

+142
-101
lines changed

1 file changed

+142
-101
lines changed

‎crates/ra_ide/src/references/rename.rs‎

Lines changed: 142 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -305,47 +305,17 @@ mod tests {
305305

306306
#[test]
307307
fn test_rename_to_underscore() {
308-
check(
309-
"_",
310-
r#"
311-
fn main() {
312-
let i<|> = 1;
313-
}
314-
"#,
315-
r#"
316-
fn main() {
317-
let _ = 1;
318-
}
319-
"#,
320-
);
308+
check("_", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let _ = 1; }"#);
321309
}
322310

323311
#[test]
324312
fn test_rename_to_raw_identifier() {
325-
check(
326-
"r#fn",
327-
r#"
328-
fn main() {
329-
let i<|> = 1;
330-
}
331-
"#,
332-
r#"
333-
fn main() {
334-
let r#fn = 1;
335-
}
336-
"#,
337-
);
313+
check("r#fn", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let r#fn = 1; }"#);
338314
}
339315

340316
#[test]
341317
fn test_rename_to_invalid_identifier() {
342-
let (analysis, position) = analysis_and_position(
343-
r#"
344-
fn main() {
345-
let i<|> = 1;
346-
}
347-
"#,
348-
);
318+
let (analysis, position) = analysis_and_position(r#"fn main() { let i<|> = 1; }"#);
349319
let new_name = "invalid!";
350320
let source_change = analysis.rename(position, new_name).unwrap();
351321
assert!(source_change.is_none());
@@ -361,9 +331,7 @@ fn main() {
361331
let j = 1;
362332
i = i<|> + j;
363333
364-
{
365-
i = 0;
366-
}
334+
{ i = 0; }
367335
368336
i = 5;
369337
}
@@ -374,9 +342,7 @@ fn main() {
374342
let j = 1;
375343
k = k + j;
376344
377-
{
378-
k = 0;
379-
}
345+
{ k = 0; }
380346
381347
k = 5;
382348
}
@@ -470,53 +436,17 @@ fn main() {
470436

471437
#[test]
472438
fn test_rename_for_param_inside() {
473-
check(
474-
"j",
475-
r#"
476-
fn foo(i : u32) -> u32 {
477-
i<|>
478-
}
479-
"#,
480-
r#"
481-
fn foo(j : u32) -> u32 {
482-
j
483-
}
484-
"#,
485-
);
439+
check("j", r#"fn foo(i : u32) -> u32 { i<|> }"#, r#"fn foo(j : u32) -> u32 { j }"#);
486440
}
487441

488442
#[test]
489443
fn test_rename_refs_for_fn_param() {
490-
check(
491-
"new_name",
492-
r#"
493-
fn foo(i<|> : u32) -> u32 {
494-
i
495-
}
496-
"#,
497-
r#"
498-
fn foo(new_name : u32) -> u32 {
499-
new_name
500-
}
501-
"#,
502-
);
444+
check("j", r#"fn foo(i<|> : u32) -> u32 { i }"#, r#"fn foo(j : u32) -> u32 { j }"#);
503445
}
504446

505447
#[test]
506448
fn test_rename_for_mut_param() {
507-
check(
508-
"new_name",
509-
r#"
510-
fn foo(mut i<|> : u32) -> u32 {
511-
i
512-
}
513-
"#,
514-
r#"
515-
fn foo(mut new_name : u32) -> u32 {
516-
new_name
517-
}
518-
"#,
519-
);
449+
check("j", r#"fn foo(mut i<|> : u32) -> u32 { i }"#, r#"fn foo(mut j : u32) -> u32 { j }"#);
520450
}
521451

522452
#[test]
@@ -602,7 +532,6 @@ impl Foo {
602532
"j",
603533
r#"
604534
struct Foo { i<|>: i32 }
605-
606535
struct Bar { i: i32 }
607536
608537
impl Bar {
@@ -613,7 +542,6 @@ impl Bar {
613542
"#,
614543
r#"
615544
struct Foo { j: i32 }
616-
617545
struct Bar { i: i32 }
618546
619547
impl Bar {
@@ -721,7 +649,53 @@ pub struct FooContent;
721649
//- /bar.rs
722650
use crate::foo<|>::FooContent;
723651
"#,
724-
expect![[]],
652+
expect![[r#"
653+
RangeInfo {
654+
range: 11..14,
655+
info: SourceChange {
656+
source_file_edits: [
657+
SourceFileEdit {
658+
file_id: FileId(
659+
1,
660+
),
661+
edit: TextEdit {
662+
indels: [
663+
Indel {
664+
insert: "quux",
665+
delete: 8..11,
666+
},
667+
],
668+
},
669+
},
670+
SourceFileEdit {
671+
file_id: FileId(
672+
3,
673+
),
674+
edit: TextEdit {
675+
indels: [
676+
Indel {
677+
insert: "quux",
678+
delete: 11..14,
679+
},
680+
],
681+
},
682+
},
683+
],
684+
file_system_edits: [
685+
MoveFile {
686+
src: FileId(
687+
2,
688+
),
689+
anchor: FileId(
690+
3,
691+
),
692+
dst: "quux.rs",
693+
},
694+
],
695+
is_snippet: false,
696+
},
697+
}
698+
"#]],
725699
);
726700
}
727701

@@ -735,7 +709,40 @@ mod fo<|>o;
735709
//- /foo/mod.rs
736710
// emtpy
737711
"#,
738-
expect![[]],
712+
expect![[r#"
713+
RangeInfo {
714+
range: 4..7,
715+
info: SourceChange {
716+
source_file_edits: [
717+
SourceFileEdit {
718+
file_id: FileId(
719+
1,
720+
),
721+
edit: TextEdit {
722+
indels: [
723+
Indel {
724+
insert: "foo2",
725+
delete: 4..7,
726+
},
727+
],
728+
},
729+
},
730+
],
731+
file_system_edits: [
732+
MoveFile {
733+
src: FileId(
734+
2,
735+
),
736+
anchor: FileId(
737+
1,
738+
),
739+
dst: "../foo2/mod.rs",
740+
},
741+
],
742+
is_snippet: false,
743+
},
744+
}
745+
"#]],
739746
);
740747
}
741748

@@ -744,22 +751,14 @@ mod fo<|>o;
744751
check(
745752
"baz",
746753
r#"
747-
mod <|>foo {
748-
pub fn bar() {}
749-
}
754+
mod <|>foo { pub fn bar() {} }
750755
751-
fn main() {
752-
foo::bar();
753-
}
756+
fn main() { foo::bar(); }
754757
"#,
755758
r#"
756-
mod baz {
757-
pub fn bar() {}
758-
}
759+
mod baz { pub fn bar() {} }
759760
760-
fn main() {
761-
baz::bar();
762-
}
761+
fn main() { baz::bar(); }
763762
"#,
764763
);
765764
}
@@ -781,7 +780,53 @@ pub mod foo<|>;
781780
//- /bar/foo.rs
782781
// pub fn fun() {}
783782
"#,
784-
expect![[]],
783+
expect![[r#"
784+
RangeInfo {
785+
range: 8..11,
786+
info: SourceChange {
787+
source_file_edits: [
788+
SourceFileEdit {
789+
file_id: FileId(
790+
2,
791+
),
792+
edit: TextEdit {
793+
indels: [
794+
Indel {
795+
insert: "foo2",
796+
delete: 8..11,
797+
},
798+
],
799+
},
800+
},
801+
SourceFileEdit {
802+
file_id: FileId(
803+
1,
804+
),
805+
edit: TextEdit {
806+
indels: [
807+
Indel {
808+
insert: "foo2",
809+
delete: 27..30,
810+
},
811+
],
812+
},
813+
},
814+
],
815+
file_system_edits: [
816+
MoveFile {
817+
src: FileId(
818+
3,
819+
),
820+
anchor: FileId(
821+
2,
822+
),
823+
dst: "foo2.rs",
824+
},
825+
],
826+
is_snippet: false,
827+
},
828+
}
829+
"#]],
785830
);
786831
}
787832

@@ -791,9 +836,7 @@ pub mod foo<|>;
791836
"Baz",
792837
r#"
793838
mod foo {
794-
pub enum Foo {
795-
Bar<|>,
796-
}
839+
pub enum Foo { Bar<|> }
797840
}
798841
799842
fn func(f: foo::Foo) {
@@ -804,9 +847,7 @@ fn func(f: foo::Foo) {
804847
"#,
805848
r#"
806849
mod foo {
807-
pub enum Foo {
808-
Baz,
809-
}
850+
pub enum Foo { Baz }
810851
}
811852
812853
fn func(f: foo::Foo) {

0 commit comments

Comments
 (0)