Add a Union to the base item completion test fixture

Author: Veykril

crates/ide_completion/src/completions/qualified_path.rs

@@ -255,60 +255,6 @@ mod tests {
         expect.assert_eq(&actual);
     }
 
-    fn check_builtin(ra_fixture: &str, expect: Expect) {
-        let actual = filtered_completion_list(ra_fixture, CompletionKind::BuiltinType);
-        expect.assert_eq(&actual);
-    }
-
-    #[test]
-    fn dont_complete_primitive_in_use() {
-        check_builtin(r#"use self::$0;"#, expect![[""]]);
-    }
-
-    #[test]
-    fn dont_complete_primitive_in_module_scope() {
-        check_builtin(r#"fn foo() { self::$0 }"#, expect![[""]]);
-    }
-
-    #[test]
-    fn completes_enum_variant() {
-        check(
-            r#"
-enum E { Foo, Bar(i32) }
-fn foo() { let _ = E::$0 }
-"#,
-            expect![[r#"
-                ev Foo    ()
-                ev Bar(…) (i32)
-            "#]],
-        );
-    }
-
-    #[test]
-    fn completes_struct_associated_items() {
-        check(
-            r#"
-//- /lib.rs
-struct S;
-
-impl S {
-    fn a() {}
-    fn b(&self) {}
-    const C: i32 = 42;
-    type T = i32;
-}
-
-fn foo() { let _ = S::$0 }
-"#,
-            expect![[r#"
-                fn a()  fn()
-                me b(…) fn(&self)
-                ct C    const C: i32 = 42;
-                ta T    type T = i32;
-            "#]],
-        );
-    }
-
     #[test]
     fn associated_item_visibility() {
         check(
@@ -336,21 +282,6 @@ fn foo() { let _ = S::$0 }
         );
     }
 
-    #[test]
-    fn completes_enum_associated_method() {
-        check(
-            r#"
-enum E {};
-impl E { fn m() { } }
-
-fn foo() { let _ = E::$0 }
-        "#,
-            expect![[r#"
-                fn m() fn()
-            "#]],
-        );
-    }
-
     #[test]
     fn completes_union_associated_method() {
         check(

crates/ide_completion/src/tests.rs

@@ -1,11 +1,12 @@
 //! Tests and test utilities for completions.
 //!
-//! Most tests live in this module or its submodules unless for very specific completions like
-//! `attributes` or `lifetimes` where the completed concept is a distinct thing.
-//! Notable examples for completions that are being tested in this module's submodule are paths.
-//! Another exception are `check_edit` tests which usually live in the completion modules themselves,
-//! as the main purpose of this test module here is to give the developer an overview of whats being
-//! completed where, not how.
+//! Most tests live in this module or its submodules. The tests in these submodules are "location"
+//! oriented, that is they try to check completions for something like type position, param position
+//! etc.
+//! Tests that are more orientated towards specific completion types like visibility checks of path
+//! completions or `check_edit` tests usually live in their respective completion modules instead.
+//! This gives this test module and its submodules here the main purpose of giving the developer an
+//! overview of whats being completed where, not how.
 
 mod attribute;
 mod expression;
@@ -55,6 +56,7 @@ macro_rules! makro {}
 #[rustc_builtin_macro]
 pub macro Clone {}
 fn function() {}
+union Union { field: i32 }
 "#;
 
 pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig {

crates/ide_completion/src/tests/expression.rs

@@ -70,6 +70,7 @@ impl Unit {
     }
 }
 "#,
+        // `self` is in here twice, once as the module, once as the local
         expect![[r##"
             kw unsafe
             kw fn
@@ -114,12 +115,42 @@ impl Unit {
             ?? Unresolved
             fn function()   fn()
             sc STATIC
+            un Union
             ev TupleV(…)    (u32)
             ct CONST
             ma makro!(…)    #[macro_export] macro_rules! makro
             me self.foo()   fn(self)
         "##]],
     );
+    check(
+        r#"
+use non_existant::Unresolved;
+mod qualified { pub enum Enum { Variant } }
+
+impl Unit {
+    fn foo<'lifetime, TypeParam, const CONST_PARAM: usize>(self) {
+        fn local_func() {}
+        self::$0
+    }
+}
+"#,
+        expect![[r##"
+            tt Trait
+            en Enum
+            st Record
+            st Tuple
+            md module
+            st Unit
+            md qualified
+            ma makro!(…)  #[macro_export] macro_rules! makro
+            ?? Unresolved
+            fn function() fn()
+            sc STATIC
+            un Union
+            ev TupleV(…)  (u32)
+            ct CONST
+        "##]],
+    );
 }
 
 #[test]
@@ -247,3 +278,27 @@ fn quux(x: i32) {
         "#]],
     );
 }
+
+#[test]
+fn enum_qualified() {
+    check(
+        r#"
+impl Enum {
+    type AssocType = ();
+    const ASSOC_CONST: () = ();
+    fn assoc_fn() {}
+}
+fn func() {
+    Enum::$0
+}
+"#,
+        expect![[r#"
+            ev TupleV(…)   (u32)
+            ev RecordV     { field: u32 }
+            ev UnitV       ()
+            ct ASSOC_CONST const ASSOC_CONST: () = ();
+            fn assoc_fn()  fn()
+            ta AssocType   type AssocType = ();
+        "#]],
+    );
+}

crates/ide_completion/src/tests/item.rs

@@ -28,6 +28,7 @@ impl Tra$0
             md module
             st Unit
             ma makro!(…) #[macro_export] macro_rules! makro
+            un Union
             ma makro!(…) #[macro_export] macro_rules! makro
             bt u32
         "##]],
@@ -51,6 +52,7 @@ impl Trait for Str$0
             md module
             st Unit
             ma makro!(…) #[macro_export] macro_rules! makro
+            un Union
             ma makro!(…) #[macro_export] macro_rules! makro
             bt u32
         "##]],