aboutsummaryrefslogtreecommitdiff
path: root/crates/ide_completion/src/completions
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ide_completion/src/completions')
-rw-r--r--crates/ide_completion/src/completions/keyword.rs32
-rw-r--r--crates/ide_completion/src/completions/mod_.rs4
-rw-r--r--crates/ide_completion/src/completions/qualified_path.rs20
-rw-r--r--crates/ide_completion/src/completions/unqualified_path.rs17
4 files changed, 2 insertions, 71 deletions
diff --git a/crates/ide_completion/src/completions/keyword.rs b/crates/ide_completion/src/completions/keyword.rs
index af67f9315..c5cd3c2f7 100644
--- a/crates/ide_completion/src/completions/keyword.rs
+++ b/crates/ide_completion/src/completions/keyword.rs
@@ -388,22 +388,6 @@ fn quux() -> i32 {
388 } 388 }
389 389
390 #[test] 390 #[test]
391 fn test_where_keyword() {
392 check(
393 r"trait A $0",
394 expect![[r#"
395 kw where
396 "#]],
397 );
398 check(
399 r"impl A $0",
400 expect![[r#"
401 kw where
402 "#]],
403 );
404 }
405
406 #[test]
407 fn no_keyword_completion_in_comments() { 391 fn no_keyword_completion_in_comments() {
408 cov_mark::check!(no_keyword_completion_in_comments); 392 cov_mark::check!(no_keyword_completion_in_comments);
409 check( 393 check(
@@ -480,22 +464,6 @@ fn foo() {
480 } 464 }
481 465
482 #[test] 466 #[test]
483 fn before_field() {
484 check(
485 r#"
486struct Foo {
487 $0
488 pub f: i32,
489}
490"#,
491 expect![[r#"
492 kw pub(crate)
493 kw pub
494 "#]],
495 )
496 }
497
498 #[test]
499 fn skip_struct_initializer() { 467 fn skip_struct_initializer() {
500 cov_mark::check!(no_keyword_completion_in_record_lit); 468 cov_mark::check!(no_keyword_completion_in_record_lit);
501 check( 469 check(
diff --git a/crates/ide_completion/src/completions/mod_.rs b/crates/ide_completion/src/completions/mod_.rs
index dee3ec88d..1c864c0e7 100644
--- a/crates/ide_completion/src/completions/mod_.rs
+++ b/crates/ide_completion/src/completions/mod_.rs
@@ -141,11 +141,11 @@ fn module_chain_to_containing_module_file(
141 141
142#[cfg(test)] 142#[cfg(test)]
143mod tests { 143mod tests {
144 use crate::{tests::filtered_completion_list, CompletionKind}; 144 use crate::tests::completion_list;
145 use expect_test::{expect, Expect}; 145 use expect_test::{expect, Expect};
146 146
147 fn check(ra_fixture: &str, expect: Expect) { 147 fn check(ra_fixture: &str, expect: Expect) {
148 let actual = filtered_completion_list(ra_fixture, CompletionKind::Magic); 148 let actual = completion_list(ra_fixture);
149 expect.assert_eq(&actual); 149 expect.assert_eq(&actual);
150 } 150 }
151 151
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs
index 0597879ac..88f4d940d 100644
--- a/crates/ide_completion/src/completions/qualified_path.rs
+++ b/crates/ide_completion/src/completions/qualified_path.rs
@@ -556,26 +556,6 @@ fn f() {m::$0}
556 } 556 }
557 557
558 #[test] 558 #[test]
559 fn completes_in_assoc_item_list() {
560 check(
561 r#"
562#[macro_export]
563macro_rules! foo { () => {} }
564mod bar {}
565
566struct MyStruct {}
567impl MyStruct {
568 crate::$0
569}
570"#,
571 expect![[r##"
572 md bar
573 ma foo!(…) #[macro_export] macro_rules! foo
574 "##]],
575 );
576 }
577
578 #[test]
579 fn completes_reexported_items_under_correct_name() { 559 fn completes_reexported_items_under_correct_name() {
580 check( 560 check(
581 r#" 561 r#"
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs
index 6f96eceb9..1864bfbcc 100644
--- a/crates/ide_completion/src/completions/unqualified_path.rs
+++ b/crates/ide_completion/src/completions/unqualified_path.rs
@@ -713,23 +713,6 @@ fn f() {}
713 } 713 }
714 714
715 #[test] 715 #[test]
716 fn completes_target_type_or_trait_in_impl_block() {
717 check(
718 r#"
719trait MyTrait {}
720struct MyStruct {}
721
722impl My$0
723"#,
724 expect![[r#"
725 sp Self
726 tt MyTrait
727 st MyStruct
728 "#]],
729 )
730 }
731
732 #[test]
733 fn completes_types_and_const_in_arg_list() { 716 fn completes_types_and_const_in_arg_list() {
734 check( 717 check(
735 r#" 718 r#"