From f7ba7013045fc0629092ea4e07ce5c768a7ee95f Mon Sep 17 00:00:00 2001
From: Nayeem Rahman <nayeemrmn99@gmail.com>
Date: Mon, 18 Sep 2023 19:55:24 +0100
Subject: fix(lsp): prefer local auto-import specifiers (#20539)

Give auto-import completion entries a sort-text suffix depending on if
the specifier parses as a URL. This will favour relative and bare
(likely import-mapped) specifiers.
---
 cli/lsp/tsc.rs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'cli/lsp')

diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs
index 7442f8a1e..2c63131b6 100644
--- a/cli/lsp/tsc.rs
+++ b/cli/lsp/tsc.rs
@@ -2817,10 +2817,10 @@ impl CompletionEntry {
     let mut kind: Option<lsp::CompletionItemKind> =
       Some(self.kind.clone().into());
 
-    let sort_text = if self.source.is_some() {
-      Some(format!("\u{ffff}{}", self.sort_text))
+    let mut sort_text = if self.source.is_some() {
+      format!("\u{ffff}{}", self.sort_text)
     } else {
-      Some(self.sort_text.clone())
+      self.sort_text.clone()
     };
 
     let preselect = self.is_recommended;
@@ -2888,6 +2888,13 @@ impl CompletionEntry {
           }
         }
       }
+      // We want relative or bare (import-mapped or otherwise) specifiers to
+      // appear at the top.
+      if resolve_url(&source).is_err() {
+        sort_text += "_0";
+      } else {
+        sort_text += "_1";
+      }
       label_details
         .get_or_insert_with(Default::default)
         .description = Some(source);
@@ -2919,7 +2926,7 @@ impl CompletionEntry {
       label,
       label_details,
       kind,
-      sort_text,
+      sort_text: Some(sort_text),
       preselect,
       text_edit,
       filter_text,
-- 
cgit v1.2.3