fix: tests

Author: mustakimali

crates/ide-completion/src/item.rs

@@ -217,7 +217,7 @@ pub struct CompletionRelevanceAssociatedFn {
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum CompletionRelevanceAssociatedFnType {
-    Unknown,
+    Other,
     /// Returns a type that is expected in this context
     ReturnsExpectedType,
     /// Returns the Self type of the impl/trait
@@ -304,7 +304,7 @@ impl CompletionRelevance {
                 CompletionRelevanceAssociatedFnType::DirectConstructor => 15,
                 CompletionRelevanceAssociatedFnType::Builder => 10,
                 CompletionRelevanceAssociatedFnType::Constructor => 5,
-                CompletionRelevanceAssociatedFnType::Unknown => 0,
+                CompletionRelevanceAssociatedFnType::Other => 0,
             }  + if !asf.has_args { 5 } else { 0 })
             .unwrap_or_default();
 

crates/ide-completion/src/render.rs

@@ -1319,6 +1319,24 @@ impl S {
                         documentation: Documentation(
                             "Method docs",
                         ),
+                        relevance: CompletionRelevance {
+                            exact_name_match: false,
+                            type_match: None,
+                            is_local: false,
+                            is_item_from_trait: false,
+                            is_name_already_imported: false,
+                            requires_import: false,
+                            is_op_method: false,
+                            is_private_editable: false,
+                            postfix_match: None,
+                            is_definite: false,
+                            associated_fn: Some(
+                                CompletionRelevanceAssociatedFn {
+                                    has_args: true,
+                                    ty: Other,
+                                },
+                            ),
+                        },
                     },
                     CompletionItem {
                         label: "foo",
@@ -1436,7 +1454,10 @@ fn foo(s: S) { s.$0 }
                             postfix_match: None,
                             is_definite: false,
                             associated_fn: Some(
-                                ReturnsExpectedType,
+                                CompletionRelevanceAssociatedFn {
+                                    has_args: true,
+                                    ty: Other,
+                                },
                             ),
                         },
                     },
@@ -2117,7 +2138,10 @@ fn foo(f: Foo) { let _: &u32 = f.b$0 }
                             postfix_match: None,
                             is_definite: false,
                             associated_fn: Some(
-                                DirectConstructorWithArgs,
+                                CompletionRelevanceAssociatedFn {
+                                    has_args: true,
+                                    ty: Other,
+                                },
                             ),
                         },
                         ref_match: "&@107",
@@ -2244,7 +2268,10 @@ fn main() {
                             postfix_match: None,
                             is_definite: false,
                             associated_fn: Some(
-                                DirectConstructor,
+                                CompletionRelevanceAssociatedFn {
+                                    has_args: false,
+                                    ty: Other,
+                                },
                             ),
                         },
                         ref_match: "&@92",

crates/ide-completion/src/render/function.rs

@@ -174,6 +174,7 @@ fn compute_associated_fn(
     }
 
     let ret_type = func.ret_type(db);
+    let ret_unit_type = ret_type.is_unit();
     let self_ty = match func_kind {
         FuncKind::Function(PathCompletionCtx {
             qualified: Qualified::With { path, .. }, ..
@@ -189,7 +190,10 @@ fn compute_associated_fn(
         })
         .unwrap_or_else(|| (false, false));
 
-    let ty = if !returns_self && ctx.completion.expected_type.as_ref() == Some(&ret_type) {
+    let ty = if !returns_self
+        && !ret_unit_type
+        && ctx.completion.expected_type.as_ref() == Some(&ret_type)
+    {
         // impl Foo { fn baz(&self) -> u32 { 0 } }
         // let _: u32 = foo.$0; // baz is preffered as it returns expected u32
         CompletionRelevanceAssociatedFnType::ReturnsExpectedType
@@ -203,7 +207,7 @@ fn compute_associated_fn(
         // fn() -> A
         CompletionRelevanceAssociatedFnType::DirectConstructor
     } else {
-        CompletionRelevanceAssociatedFnType::Unknown
+        CompletionRelevanceAssociatedFnType::Other
     };
 
     Some(CompletionRelevanceAssociatedFn { ty, has_args: !func.assoc_fn_params(db).is_empty() })