tweak: prefer no self args

Author: mustakimali

crates/ide-completion/src/item.rs

@@ -210,6 +210,7 @@ pub enum CompletionRelevancePostfixMatch {
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub struct CompletionRelevanceAssociatedFn {
     pub has_args: bool,
+    pub has_self_arg: bool,
     pub ty: CompletionRelevanceAssociatedFnType,
 }
 
@@ -293,13 +294,21 @@ impl CompletionRelevance {
         }
 
         score += associated_fn
-            .map(|asf| match asf.ty {
-                CompletionRelevanceAssociatedFnType::ReturnsExpectedType => 20,
-                CompletionRelevanceAssociatedFnType::DirectConstructor => 15,
-                CompletionRelevanceAssociatedFnType::Builder => 10,
-                CompletionRelevanceAssociatedFnType::Constructor => 5,
-                CompletionRelevanceAssociatedFnType::Other => 0,
-            }  + if !asf.has_args { 5 } else { 0 })
+            .map(|asf| {
+                let mut score = match asf.ty {
+                    CompletionRelevanceAssociatedFnType::ReturnsExpectedType => 20,
+                    CompletionRelevanceAssociatedFnType::DirectConstructor => 15,
+                    CompletionRelevanceAssociatedFnType::Builder => 10,
+                    CompletionRelevanceAssociatedFnType::Constructor => 5,
+                    CompletionRelevanceAssociatedFnType::Other => 0,
+                };
+
+                // Prefer functions with no arguments, then functions with self arguments
+                score += if !asf.has_args { 2 } else { 0 };
+                score -= if score > 0 && asf.has_self_arg { 1 } else { 0 };
+
+                score
+            })
             .unwrap_or_default();
 
         score

crates/ide-completion/src/render.rs

@@ -1330,6 +1330,7 @@ impl S {
                             associated_fn: Some(
                                 CompletionRelevanceAssociatedFn {
                                     has_args: true,
+                                    has_self_arg: true,
                                     ty: Other,
                                 },
                             ),
@@ -1453,6 +1454,7 @@ fn foo(s: S) { s.$0 }
                             associated_fn: Some(
                                 CompletionRelevanceAssociatedFn {
                                     has_args: true,
+                                    has_self_arg: true,
                                     ty: Other,
                                 },
                             ),
@@ -2221,6 +2223,7 @@ fn foo(f: Foo) { let _: &u32 = f.b$0 }
                             associated_fn: Some(
                                 CompletionRelevanceAssociatedFn {
                                     has_args: true,
+                                    has_self_arg: true,
                                     ty: Other,
                                 },
                             ),
@@ -2350,6 +2353,7 @@ fn main() {
                             associated_fn: Some(
                                 CompletionRelevanceAssociatedFn {
                                     has_args: false,
+                                    has_self_arg: false,
                                     ty: Other,
                                 },
                             ),

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

@@ -171,6 +171,7 @@ fn compute_associated_fn(
 
     let has_args = !func.assoc_fn_params(db).is_empty();
     let ret_type = func.ret_type(db);
+    let has_self_arg = func.self_param(db).is_some();
     let ret_unit_type = ret_type.is_unit();
     let self_type = match func_kind {
         FuncKind::Function(PathCompletionCtx {
@@ -211,7 +212,7 @@ fn compute_associated_fn(
         CompletionRelevanceAssociatedFnType::Other
     };
 
-    Some(CompletionRelevanceAssociatedFn { ty, has_args })
+    Some(CompletionRelevanceAssociatedFn { ty, has_args, has_self_arg })
 }
 
 pub(super) fn add_call_parens<'b>(