completion relevance consider if types can be unified

Author: JoshMcguigan

crates/hir/src/lib.rs

@@ -51,7 +51,7 @@ use hir_def::{
 };
 use hir_expand::{diagnostics::DiagnosticSink, name::name, MacroDefKind};
 use hir_ty::{
-    autoderef,
+    autoderef, could_unify,
     method_resolution::{self, TyFingerprint},
     primitive::UintTy,
     to_assoc_type_id,
@@ -2100,6 +2100,10 @@ impl Type {
 
         walk_type(db, self, &mut cb);
     }
+
+    pub fn could_unify_with(&self, other: &Type) -> bool {
+        could_unify(&self.ty.value, &other.ty.value)
+    }
 }
 
 // FIXME: closures

crates/hir_ty/src/infer.rs

@@ -45,6 +45,7 @@ use crate::{
     to_assoc_type_id, AliasTy, Interner, TyKind,
 };
 
+pub use unify::could_unify;
 pub(crate) use unify::unify;
 
 mod unify;

crates/hir_ty/src/infer/unify.rs

@@ -147,6 +147,10 @@ impl<T> Canonicalized<T> {
     }
 }
 
+pub fn could_unify(t1: &Ty, t2: &Ty) -> bool {
+    InferenceTable::new().unify(t1, t2)
+}
+
 pub(crate) fn unify(tys: &Canonical<(Ty, Ty)>) -> Option<Substs> {
     let mut table = InferenceTable::new();
     let vars = Substs(

crates/hir_ty/src/lib.rs

@@ -40,7 +40,7 @@ use crate::{
 };
 
 pub use autoderef::autoderef;
-pub use infer::{InferenceResult, InferenceVar};
+pub use infer::{could_unify, InferenceResult, InferenceVar};
 pub use lower::{
     associated_type_shorthand_candidates, callable_item_sig, CallableDefId, ImplTraitLoweringMode,
     TyDefId, TyLoweringContext, ValueTyDefId,

crates/ide_completion/src/render.rs

@@ -311,7 +311,8 @@ fn compute_exact_type_match(ctx: &CompletionContext, completion_ty: &hir::Type)
         Some(expected_type) => {
             // We don't ever consider unit type to be an exact type match, since
             // nearly always this is not meaningful to the user.
-            completion_ty == expected_type && !expected_type.is_unit()
+            (completion_ty == expected_type || expected_type.could_unify_with(completion_ty))
+                && !expected_type.is_unit()
         }
         None => false,
     }
@@ -1313,4 +1314,32 @@ fn main() {
             "#]],
         )
     }
+
+    #[test]
+    fn generic_enum() {
+        check_relevance(
+            r#"
+enum Foo<T> { A(T), B }
+// bar() should not be an exact type match
+// because the generic parameters are different
+fn bar() -> Foo<u8> { Foo::B }
+// FIXME baz() should be an exact type match
+// because the types could unify, but it currently
+// is not. This is due to the T here being
+// TyKind::Placeholder rather than TyKind::Missing.
+fn baz<T>() -> Foo<T> { Foo::B }
+fn foo() {
+    let _: Foo<u32> = $0;
+}
+"#,
+            expect![[r#"
+                ev Foo::A(…) [type]
+                ev Foo::B [type]
+                en Foo []
+                fn baz() []
+                fn bar() []
+                fn foo() []
+            "#]],
+        );
+    }
 }