diff options
author | Lukas Wirth <[email protected]> | 2021-06-16 16:37:23 +0100 |
---|---|---|
committer | Lukas Wirth <[email protected]> | 2021-06-16 20:51:20 +0100 |
commit | d338a803941c2b0ac83decfcdfac33c09dfaa971 (patch) | |
tree | 6656cf5923aa537bbfba8c1bd267fe8dfafb2c14 /crates/ide_completion/src/completions | |
parent | f38770cd2606148bfe764351849ea7ebea45132c (diff) |
Start refactoring ide_completion tests
Diffstat (limited to 'crates/ide_completion/src/completions')
5 files changed, 2 insertions, 73 deletions
diff --git a/crates/ide_completion/src/completions/keyword.rs b/crates/ide_completion/src/completions/keyword.rs index 0fccbeccf..2c42438d6 100644 --- a/crates/ide_completion/src/completions/keyword.rs +++ b/crates/ide_completion/src/completions/keyword.rs | |||
@@ -231,30 +231,6 @@ mod tests { | |||
231 | } | 231 | } |
232 | 232 | ||
233 | #[test] | 233 | #[test] |
234 | fn test_keywords_at_source_file_level() { | ||
235 | check( | ||
236 | r"m$0", | ||
237 | expect![[r#" | ||
238 | kw pub(crate) | ||
239 | kw pub | ||
240 | kw unsafe | ||
241 | kw fn | ||
242 | kw const | ||
243 | kw type | ||
244 | kw use | ||
245 | kw impl | ||
246 | kw trait | ||
247 | kw static | ||
248 | kw extern | ||
249 | kw mod | ||
250 | kw enum | ||
251 | kw struct | ||
252 | kw union | ||
253 | "#]], | ||
254 | ); | ||
255 | } | ||
256 | |||
257 | #[test] | ||
258 | fn test_keywords_in_function() { | 234 | fn test_keywords_in_function() { |
259 | check( | 235 | check( |
260 | r"fn quux() { $0 }", | 236 | r"fn quux() { $0 }", |
@@ -443,18 +419,6 @@ fn quux() -> i32 { | |||
443 | } | 419 | } |
444 | 420 | ||
445 | #[test] | 421 | #[test] |
446 | fn test_keywords_after_unsafe_in_item_list() { | ||
447 | check( | ||
448 | r"unsafe $0", | ||
449 | expect![[r#" | ||
450 | kw fn | ||
451 | kw trait | ||
452 | kw impl | ||
453 | "#]], | ||
454 | ); | ||
455 | } | ||
456 | |||
457 | #[test] | ||
458 | fn test_keywords_after_unsafe_in_block_expr() { | 422 | fn test_keywords_after_unsafe_in_block_expr() { |
459 | check( | 423 | check( |
460 | r"fn my_fn() { unsafe $0 }", | 424 | r"fn my_fn() { unsafe $0 }", |
diff --git a/crates/ide_completion/src/completions/pattern.rs b/crates/ide_completion/src/completions/pattern.rs index 1daa8595a..e45b2a1ea 100644 --- a/crates/ide_completion/src/completions/pattern.rs +++ b/crates/ide_completion/src/completions/pattern.rs | |||
@@ -13,7 +13,7 @@ pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) { | |||
13 | if let Some(hir::Adt::Enum(e)) = | 13 | if let Some(hir::Adt::Enum(e)) = |
14 | ctx.expected_type.as_ref().and_then(|ty| ty.strip_references().as_adt()) | 14 | ctx.expected_type.as_ref().and_then(|ty| ty.strip_references().as_adt()) |
15 | { | 15 | { |
16 | super::complete_enum_variants(acc, ctx, e, |acc, ctx, variant, path| { | 16 | super::enum_variants_with_paths(acc, ctx, e, |acc, ctx, variant, path| { |
17 | acc.add_qualified_variant_pat(ctx, variant, path.clone()); | 17 | acc.add_qualified_variant_pat(ctx, variant, path.clone()); |
18 | acc.add_qualified_enum_variant(ctx, variant, path); | 18 | acc.add_qualified_enum_variant(ctx, variant, path); |
19 | }); | 19 | }); |
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs index 1643eeed4..165b9e6a5 100644 --- a/crates/ide_completion/src/completions/qualified_path.rs +++ b/crates/ide_completion/src/completions/qualified_path.rs | |||
@@ -714,24 +714,6 @@ impl MyStruct { | |||
714 | } | 714 | } |
715 | 715 | ||
716 | #[test] | 716 | #[test] |
717 | fn completes_in_item_list() { | ||
718 | check( | ||
719 | r#" | ||
720 | struct MyStruct {} | ||
721 | #[macro_export] | ||
722 | macro_rules! foo {} | ||
723 | mod bar {} | ||
724 | |||
725 | crate::$0 | ||
726 | "#, | ||
727 | expect![[r#" | ||
728 | md bar | ||
729 | ma foo!(…) #[macro_export] macro_rules! foo | ||
730 | "#]], | ||
731 | ) | ||
732 | } | ||
733 | |||
734 | #[test] | ||
735 | fn test_super_super_completion() { | 717 | fn test_super_super_completion() { |
736 | check( | 718 | check( |
737 | r#" | 719 | r#" |
diff --git a/crates/ide_completion/src/completions/snippet.rs b/crates/ide_completion/src/completions/snippet.rs index b9862de67..5560f1acf 100644 --- a/crates/ide_completion/src/completions/snippet.rs +++ b/crates/ide_completion/src/completions/snippet.rs | |||
@@ -105,21 +105,4 @@ mod tests { | |||
105 | check(r#"fn foo(x: i32) { ::foo$0 }"#, expect![[""]]); | 105 | check(r#"fn foo(x: i32) { ::foo$0 }"#, expect![[""]]); |
106 | check(r#"fn foo(x: i32) { ::$0 }"#, expect![[""]]); | 106 | check(r#"fn foo(x: i32) { ::$0 }"#, expect![[""]]); |
107 | } | 107 | } |
108 | |||
109 | #[test] | ||
110 | fn completes_snippets_in_items() { | ||
111 | check( | ||
112 | r#" | ||
113 | #[cfg(test)] | ||
114 | mod tests { | ||
115 | $0 | ||
116 | } | ||
117 | "#, | ||
118 | expect![[r#" | ||
119 | sn tmod (Test module) | ||
120 | sn tfn (Test function) | ||
121 | sn macro_rules | ||
122 | "#]], | ||
123 | ) | ||
124 | } | ||
125 | } | 108 | } |
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs index b5af1c810..2c623bf7a 100644 --- a/crates/ide_completion/src/completions/unqualified_path.rs +++ b/crates/ide_completion/src/completions/unqualified_path.rs | |||
@@ -40,7 +40,7 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC | |||
40 | if let Some(hir::Adt::Enum(e)) = | 40 | if let Some(hir::Adt::Enum(e)) = |
41 | ctx.expected_type.as_ref().and_then(|ty| ty.strip_references().as_adt()) | 41 | ctx.expected_type.as_ref().and_then(|ty| ty.strip_references().as_adt()) |
42 | { | 42 | { |
43 | super::complete_enum_variants(acc, ctx, e, |acc, ctx, variant, path| { | 43 | super::enum_variants_with_paths(acc, ctx, e, |acc, ctx, variant, path| { |
44 | acc.add_qualified_enum_variant(ctx, variant, path) | 44 | acc.add_qualified_enum_variant(ctx, variant, path) |
45 | }); | 45 | }); |
46 | } | 46 | } |