save

Author: mustakimali

crates/ide-completion/src/completions.rs

@@ -593,40 +593,6 @@ impl Completions {
         }
         self.add_opt(render_struct_pat(RenderContext::new(ctx), pattern_ctx, strukt, local_name));
     }
-
-    /// Sort the suggestions with `new` like functions first.
-    /// That means:
-    /// fn with no param that returns itself
-    /// fn with param that returns itself
-    pub(crate) fn sort_new_first(&mut self) {
-        // ToDo: Ensure these fn returns Self
-        fn maybe_new(item: &CompletionItem) -> bool {
-            item.detail.as_ref().map(|d| d.starts_with("fn() -> ")).unwrap_or_default()
-        }
-        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 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);
-            }
-        }
-    }
 }
 
 /// Calls the callback for each variant of the provided enum with the path to the variant.
@@ -730,7 +696,7 @@ pub(super) fn complete_name_ref(
                     snippet::complete_expr_snippet(acc, ctx, path_ctx, expr_ctx);
 
                     if matches!(ctx.token.kind(), syntax::SyntaxKind::COLON2) {
-                        acc.sort_new_first();
+                        bump_relevance_for_new_like_fns(acc);
                     }
                 }
                 PathKind::Type { location } => {
@@ -805,3 +771,37 @@ fn complete_patterns(
     pattern::complete_pattern(acc, ctx, pattern_ctx);
     record::complete_record_pattern_fields(acc, ctx, pattern_ctx);
 }
+
+/// Sort the suggestions with `new` like functions first.
+/// That means:
+/// fn with no param that returns itself
+/// fn with param that returns itself
+pub(crate) fn bump_relevance_for_new_like_fns(acc: &mut Completions) {
+    // ToDo: Ensure these fn returns Self
+    fn maybe_new(item: &CompletionItem) -> bool {
+        item.detail.as_ref().map(|d| d.starts_with("fn() -> ")).unwrap_or_default()
+    }
+    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 acc.buf.iter_mut() {
+        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/render.rs

@@ -2033,6 +2033,33 @@ fn test() {
                 me foo(…) [type_could_unify]
             "#]],
         );
+
+        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() {
+        Self::$0;
+    }
+}
+"#,
+            // preference:
+            // fn with no param that returns itself
+            // builder like fn
+            // fn with param that returns itself
+            expect![[r#"
+                fn new_2() []
+                fn aaaabuilder() []
+                fn new_1(…) []
+                me foo(…) []
+                fn test() []
+            "#]],
+        );
     }
 
     #[test]