Skip to content

Commit 6518f18

Browse files
committed
Cleanup tests
1 parent 212fa29 commit 6518f18

File tree

1 file changed

+62
-172
lines changed

1 file changed

+62
-172
lines changed

crates/ra_ide/src/completion/presentation.rs

Lines changed: 62 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -844,189 +844,79 @@ fn f(foo: &Foo) { foo.foo(); }
844844
#[test]
845845
fn inserts_angle_brackets_for_generics() {
846846
mark::check!(inserts_angle_brackets_for_generics);
847-
assert_debug_snapshot!(
848-
do_reference_completion(
849-
r"
850-
struct Vec<T> {}
851-
fn foo(xs: Ve<|>)
852-
"
853-
),
854-
@r###"
855-
[
856-
CompletionItem {
857-
label: "Vec<…>",
858-
source_range: 28..30,
859-
delete: 28..30,
860-
insert: "Vec<$0>",
861-
kind: Struct,
862-
lookup: "Vec",
863-
},
864-
CompletionItem {
865-
label: "foo(…)",
866-
source_range: 28..30,
867-
delete: 28..30,
868-
insert: "foo(${1:xs})$0",
869-
kind: Function,
870-
lookup: "foo",
871-
detail: "fn foo(xs: Ve)",
872-
trigger_call_info: true,
873-
},
874-
]
875-
"###
847+
check_edit(
848+
"Vec",
849+
r#"
850+
struct Vec<T> {}
851+
fn foo(xs: Ve<|>)
852+
"#,
853+
r#"
854+
struct Vec<T> {}
855+
fn foo(xs: Vec<$0>)
856+
"#,
876857
);
877-
assert_debug_snapshot!(
878-
do_reference_completion(
879-
r"
880-
type Vec<T> = (T,);
881-
fn foo(xs: Ve<|>)
882-
"
883-
),
884-
@r###"
885-
[
886-
CompletionItem {
887-
label: "Vec<…>",
888-
source_range: 31..33,
889-
delete: 31..33,
890-
insert: "Vec<$0>",
891-
kind: TypeAlias,
892-
lookup: "Vec",
893-
},
894-
CompletionItem {
895-
label: "foo(…)",
896-
source_range: 31..33,
897-
delete: 31..33,
898-
insert: "foo(${1:xs})$0",
899-
kind: Function,
900-
lookup: "foo",
901-
detail: "fn foo(xs: Ve)",
902-
trigger_call_info: true,
903-
},
904-
]
905-
"###
858+
check_edit(
859+
"Vec",
860+
r#"
861+
type Vec<T> = (T,);
862+
fn foo(xs: Ve<|>)
863+
"#,
864+
r#"
865+
type Vec<T> = (T,);
866+
fn foo(xs: Vec<$0>)
867+
"#,
906868
);
907-
assert_debug_snapshot!(
908-
do_reference_completion(
909-
r"
910-
struct Vec<T = i128> {}
911-
fn foo(xs: Ve<|>)
912-
"
913-
),
914-
@r###"
915-
[
916-
CompletionItem {
917-
label: "Vec",
918-
source_range: 35..37,
919-
delete: 35..37,
920-
insert: "Vec",
921-
kind: Struct,
922-
},
923-
CompletionItem {
924-
label: "foo(…)",
925-
source_range: 35..37,
926-
delete: 35..37,
927-
insert: "foo(${1:xs})$0",
928-
kind: Function,
929-
lookup: "foo",
930-
detail: "fn foo(xs: Ve)",
931-
trigger_call_info: true,
932-
},
933-
]
934-
"###
869+
check_edit(
870+
"Vec",
871+
r#"
872+
struct Vec<T = i128> {}
873+
fn foo(xs: Ve<|>)
874+
"#,
875+
r#"
876+
struct Vec<T = i128> {}
877+
fn foo(xs: Vec)
878+
"#,
935879
);
936-
assert_debug_snapshot!(
937-
do_reference_completion(
938-
r"
939-
struct Vec<T> {}
940-
fn foo(xs: Ve<|><i128>)
941-
"
942-
),
943-
@r###"
944-
[
945-
CompletionItem {
946-
label: "Vec",
947-
source_range: 28..30,
948-
delete: 28..30,
949-
insert: "Vec",
950-
kind: Struct,
951-
},
952-
CompletionItem {
953-
label: "foo(…)",
954-
source_range: 28..30,
955-
delete: 28..30,
956-
insert: "foo(${1:xs})$0",
957-
kind: Function,
958-
lookup: "foo",
959-
detail: "fn foo(xs: Ve<i128>)",
960-
trigger_call_info: true,
961-
},
962-
]
963-
"###
880+
check_edit(
881+
"Vec",
882+
r#"
883+
struct Vec<T> {}
884+
fn foo(xs: Ve<|><i128>)
885+
"#,
886+
r#"
887+
struct Vec<T> {}
888+
fn foo(xs: Vec<i128>)
889+
"#,
964890
);
965891
}
966892

967893
#[test]
968894
fn dont_insert_macro_call_parens_unncessary() {
969895
mark::check!(dont_insert_macro_call_parens_unncessary);
970-
assert_debug_snapshot!(
971-
do_reference_completion(
972-
r"
973-
//- /main.rs
974-
use foo::<|>;
975-
976-
//- /foo/lib.rs
977-
#[macro_export]
978-
macro_rules frobnicate {
979-
() => ()
980-
}
981-
"
982-
),
983-
@r###"
984-
[
985-
CompletionItem {
986-
label: "frobnicate!",
987-
source_range: 9..9,
988-
delete: 9..9,
989-
insert: "frobnicate",
990-
kind: Macro,
991-
detail: "#[macro_export]\nmacro_rules! frobnicate",
992-
},
993-
]
994-
"###
896+
check_edit(
897+
"frobnicate!",
898+
r#"
899+
//- /main.rs
900+
use foo::<|>;
901+
//- /foo/lib.rs
902+
#[macro_export]
903+
macro_rules frobnicate { () => () }
904+
"#,
905+
r#"
906+
use foo::frobnicate;
907+
"#,
995908
);
996909

997-
assert_debug_snapshot!(
998-
do_reference_completion(
999-
r"
1000-
//- /main.rs
1001-
macro_rules frobnicate {
1002-
() => ()
1003-
}
1004-
fn main() {
1005-
frob<|>!();
1006-
}
1007-
"
1008-
),
1009-
@r###"
1010-
[
1011-
CompletionItem {
1012-
label: "frobnicate!",
1013-
source_range: 56..60,
1014-
delete: 56..60,
1015-
insert: "frobnicate",
1016-
kind: Macro,
1017-
detail: "macro_rules! frobnicate",
1018-
},
1019-
CompletionItem {
1020-
label: "main()",
1021-
source_range: 56..60,
1022-
delete: 56..60,
1023-
insert: "main()$0",
1024-
kind: Function,
1025-
lookup: "main",
1026-
detail: "fn main()",
1027-
},
1028-
]
1029-
"###
910+
check_edit(
911+
"frobnicate!",
912+
r#"
913+
macro_rules frobnicate { () => () }
914+
fn main() { frob<|>!(); }
915+
"#,
916+
r#"
917+
macro_rules frobnicate { () => () }
918+
fn main() { frobnicate!(); }
919+
"#,
1030920
);
1031921
}
1032922

0 commit comments

Comments
 (0)