save

Author: mustakimali

Cargo.toml

@@ -12,7 +12,7 @@ authors = ["rust-analyzer team"]
 [profile.dev]
 # Disabling debug info speeds up builds a bunch,
 # and we don't rely on it for debugging that much.
-debug = 0
+debug = 2
 
 [profile.dev.package]
 # These speed up local tests.

crates/ide-completion/src/completions.rs

@@ -610,6 +610,14 @@ impl Completions {
                 .map(|_| false)
         }
 
+        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));
+            }
+        }
+
         self.buf.sort_by(|a, b| {
             creates_self(b)
                 .cmp(&creates_self(a))

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

@@ -278,8 +278,8 @@ fn foo(a: A) { a.$0() }
 struct A;
 impl A {
     fn foo(&self) {}
-    fn new_1(input: u32) -> Self { A }
-    fn new_2() -> A { A }
+    fn new_1(input: u32) -> A { A }
+    fn new_2() -> Self { A }
 }
 
 fn test() {

crates/ide-completion/src/item.rs

@@ -85,6 +85,8 @@ 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.
@@ -503,6 +505,7 @@ 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/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);
+    set_score(&mut lsp_item, max_relevance, item.relevance); // TODO: copy sort_text from CompletionItem if present (+1 instance below)
 
     if config.completion().enable_imports_on_the_fly {
         if !item.import_to_add.is_empty() {
@@ -349,6 +349,7 @@ fn completion_item(
         if relevance.is_relevant() && relevance.score() == max_relevance {
             res.preselect = Some(true);
         }
+
         // The relevance needs to be inverted to come up with a sort score
         // because the client will sort ascending.
         let sort_score = relevance.score() ^ 0xFF_FF_FF_FF;