builder methods

Author: mustakimali

crates/ide-completion/src/completions.rs

@@ -45,7 +45,7 @@ use crate::{
         union_literal::render_union_literal,
         RenderContext,
     },
-    CompletionContext, CompletionItem, CompletionItemKind, CompletionRelevance,
+    CompletionContext, CompletionItem, CompletionItemKind,
 };
 
 /// Represents an in-progress set of completions being built.
@@ -600,31 +600,30 @@ impl Completions {
     /// fn with param that returns itself
     pub(crate) fn sort_new_first(&mut self) {
         // ToDo: Ensure these fn returns Self
-        fn creates_self(item: &CompletionItem) -> bool {
+        fn maybe_new(item: &CompletionItem) -> bool {
             item.detail.as_ref().map(|d| d.starts_with("fn() -> ")).unwrap_or_default()
         }
-        fn creates_self_given_args(item: &CompletionItem) -> bool {
+        fn maybe_new_with_args(item: &CompletionItem) -> bool {
             item.detail
                 .as_ref()
                 .map(|d| d.starts_with("fn(") && d.contains("->") && !d.contains("&self"))
                 .unwrap_or_default()
         }
 
+        fn maybe_builder(item: &CompletionItem) -> bool {
+            item.detail
+                .as_ref()
+                .map(|d| d.starts_with("fn() -> ") && d.contains("Builder"))
+                .unwrap_or_default()
+        }
+
         for item in self.buf.iter_mut() {
-            if creates_self(&item) {
-                //item.sort_text = Some(format!("{0:08x}", 0));
-                item.relevance = CompletionRelevance {
-                    exact_name_match: true,
-                    is_definite: true,
-                    ..Default::default()
-                };
-            } else if creates_self_given_args(&item) {
-                //item.sort_text = Some(format!("{0:08x}", 1));
-                item.relevance = CompletionRelevance {
-                    exact_name_match: true,
-                    is_local: true,
-                    ..Default::default()
-                };
+            if maybe_new(&item) {
+                item.bump_relevance_by(30);
+            } else if maybe_builder(&item) {
+                item.bump_relevance_by(20);
+            } else if maybe_new_with_args(&item) {
+                item.bump_relevance_by(10);
             }
         }
     }

crates/ide-completion/src/item.rs

@@ -164,6 +164,9 @@ pub struct CompletionRelevance {
     pub postfix_match: Option<CompletionRelevancePostfixMatch>,
     /// This is set for type inference results
     pub is_definite: bool,
+    /// Any other bonuses we want to add,
+    /// eg. bonus for good behavior!
+    pub bonus_score: u32,
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
@@ -228,6 +231,7 @@ impl CompletionRelevance {
             is_private_editable,
             postfix_match,
             is_definite,
+            bonus_score,
         } = self;
 
         // lower rank private things
@@ -269,7 +273,8 @@ impl CompletionRelevance {
         if is_definite {
             score += 10;
         }
-        score
+
+        score + bonus_score
     }
 
     /// Returns true when the score for this threshold is above
@@ -386,6 +391,10 @@ impl CompletionItem {
             )
         })
     }
+
+    pub fn bump_relevance_by(&mut self, bonus: u32) {
+        self.relevance.bonus_score += bonus;
+    }
 }
 
 /// A helper to make `CompletionItem`s.

crates/ide-completion/src/render.rs

@@ -1637,10 +1637,12 @@ fn main() {
         check_relevance(
             r#"
 struct A;
+struct ABuilder;
 impl A {
     fn foo(&self) {}
     fn new_1(input: u32) -> A { A }
     fn new_2() -> Self { A }
+    fn aaaabuilder() -> ABuilder { A }
 }
 
 fn test() {
@@ -1649,10 +1651,12 @@ fn test() {
 "#,
             // preference:
             // fn with no param that returns itself
+            // builder like fn
             // fn with param that returns itself
             expect![[r#"
-                fn new_2() [name]
-                fn new_1(…) [name+local]
+                fn new_2() [type_could_unify]
+                fn aaaabuilder() [type_could_unify]
+                fn new_1(…) [type_could_unify]
                 me foo(…) [type_could_unify]
             "#]],
         );