ops new in this codebase!

Author: mustakimali

crates/ide-completion/src/completions.rs

@@ -45,7 +45,7 @@ use crate::{
         union_literal::render_union_literal,
         RenderContext,
     },
-    CompletionContext, CompletionItem, CompletionItemKind,
+    CompletionContext, CompletionItem, CompletionItemKind, CompletionRelevance,
 };
 
 /// Represents an in-progress set of completions being built.
@@ -600,29 +600,33 @@ 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) -> Option<bool> {
-            item.detail.as_ref().filter(|d| d.starts_with("fn() -> ")).map(|_| false)
+        fn creates_self(item: &CompletionItem) -> bool {
+            item.detail.as_ref().map(|d| d.starts_with("fn() -> ")).unwrap_or_default()
         }
-        fn creates_self_given_args(item: &CompletionItem) -> Option<bool> {
+        fn creates_self_given_args(item: &CompletionItem) -> bool {
             item.detail
                 .as_ref()
-                .filter(|d| d.starts_with("fn(") && d.contains("->") && !d.contains("&self"))
-                .map(|_| false)
+                .map(|d| d.starts_with("fn(") && d.contains("->") && !d.contains("&self"))
+                .unwrap_or_default()
         }
 
         for item in self.buf.iter_mut() {
-            if creates_self(&item) == Some(true) {
-                item.sort_text = Some(format!("{0:08x}", 0));
-            } else if creates_self_given_args(&item) == Some(true) {
-                item.sort_text = Some(format!("{0:08x}", 1));
+            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()
+                };
             }
         }
-
-        self.buf.sort_by(|a, b| {
-            creates_self(b)
-                .cmp(&creates_self(a))
-                .then(creates_self_given_args(b).cmp(&creates_self_given_args(a)))
-        });
     }
 }
 

crates/ide-completion/src/completions/dot.rs

@@ -155,20 +155,14 @@ mod tests {
     use expect_test::{expect, Expect};
 
     use crate::tests::{
-        check_edit, completion_list_exact_order, completion_list_no_kw,
-        completion_list_no_kw_with_private_editable,
+        check_edit, completion_list_no_kw, completion_list_no_kw_with_private_editable,
     };
 
     fn check(ra_fixture: &str, expect: Expect) {
         let actual = completion_list_no_kw(ra_fixture);
         expect.assert_eq(&actual);
     }
 
-    fn check_exact_order(ra_fixture: &str, expect: Expect) {
-        let actual = completion_list_exact_order(ra_fixture);
-        expect.assert_eq(&actual);
-    }
-
     fn check_with_private_editable(ra_fixture: &str, expect: Expect) {
         let actual = completion_list_no_kw_with_private_editable(ra_fixture);
         expect.assert_eq(&actual);
@@ -271,32 +265,6 @@ fn foo(a: A) { a.$0() }
         );
     }
 
-    #[test]
-    fn test_suggest_new_first() {
-        check_exact_order(
-            r#"
-struct A;
-impl A {
-    fn foo(&self) {}
-    fn new_1(input: u32) -> A { A }
-    fn new_2() -> Self { A }
-}
-
-fn test() {
-    let a = A::$0;
-}
-"#,
-            // preference:
-            // fn with no param that returns itself
-            // fn with param that returns itself
-            expect![[r#"
-                fn new_2()  fn() -> A
-                fn new_1(…) fn(u32) -> A
-                me foo(…)   fn(&self)
-            "#]],
-        );
-    }
-
     #[test]
     fn test_visibility_filtering() {
         check(

crates/ide-completion/src/item.rs

@@ -85,8 +85,6 @@ pub struct CompletionItem {
     /// The import data to add to completion's edits.
     /// (ImportPath, LastSegment)
     pub import_to_add: SmallVec<[(String, String); 1]>,
-
-    pub sort_text: Option<String>,
 }
 
 // We use custom debug for CompletionItem to make snapshot tests more readable.
@@ -505,7 +503,6 @@ impl Builder {
             relevance: self.relevance,
             ref_match: self.ref_match,
             import_to_add,
-            sort_text: None,
         }
     }
     pub(crate) fn lookup_by(&mut self, lookup: impl Into<SmolStr>) -> &mut Builder {

crates/ide-completion/src/render.rs

@@ -1632,6 +1632,32 @@ fn main() {
         );
     }
 
+    #[test]
+    fn new_like_fns() {
+        check_relevance(
+            r#"
+struct A;
+impl A {
+    fn foo(&self) {}
+    fn new_1(input: u32) -> A { A }
+    fn new_2() -> Self { A }
+}
+
+fn test() {
+    let a = A::$0;
+}
+"#,
+            // preference:
+            // fn with no param that returns itself
+            // fn with param that returns itself
+            expect![[r#"
+                fn new_2() [name]
+                fn new_1(…) [name+local]
+                me foo(…) [type_could_unify]
+            "#]],
+        );
+    }
+
     #[test]
     fn struct_field_method_ref() {
         check_kinds(

crates/ide-completion/src/tests.rs

@@ -88,11 +88,6 @@ pub(crate) fn completion_list_no_kw(ra_fixture: &str) -> String {
     completion_list_with_config(TEST_CONFIG, ra_fixture, false, None)
 }
 
-pub(crate) fn completion_list_exact_order(ra_fixture: &str) -> String {
-    let items = get_all_items(TEST_CONFIG, ra_fixture, None);
-    render_completion_list(items)
-}
-
 pub(crate) fn completion_list_no_kw_with_private_editable(ra_fixture: &str) -> String {
     let mut config = TEST_CONFIG;
     config.enable_private_editable = true;

crates/rust-analyzer/src/lsp/to_proto.rs

@@ -308,7 +308,7 @@ fn completion_item(
         lsp_item.label.push_str(label_detail.as_str());
     }
 
-    set_score(&mut lsp_item, max_relevance, item.relevance); // TODO: copy sort_text from CompletionItem if present (+1 instance below)
+    set_score(&mut lsp_item, max_relevance, item.relevance);
 
     if config.completion().enable_imports_on_the_fly {
         if !item.import_to_add.is_empty() {