From e1e1da2a04f627f058dc33355a31d67abb1616b6 Mon Sep 17 00:00:00 2001
From: Nayeem Rahman <nayeemrmn99@gmail.com>
Date: Wed, 27 Mar 2024 03:10:23 +0000
Subject: [PATCH] fix(lsp): prefer cache over tsc quick fixes (#23093)

---
 cli/lsp/analysis.rs            | 20 ++++++++++++--------
 tests/integration/lsp_tests.rs | 10 +++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs
index 652697a9e3..cd7d459289 100644
--- a/cli/lsp/analysis.rs
+++ b/cli/lsp/analysis.rs
@@ -647,6 +647,10 @@ fn is_preferred(
         }
       }
       true
+    } else if let CodeActionKind::Deno(_) = i {
+      // This is to make sure 'Remove import' isn't preferred over 'Cache
+      // dependencies'.
+      return false;
     } else {
       true
     }
@@ -1031,18 +1035,18 @@ impl CodeActionCollection {
 
   /// Move out the code actions and return them as a `CodeActionResponse`.
   pub fn get_response(self) -> lsp::CodeActionResponse {
-    // Prefer TSC fixes first, then Deno fixes, then Deno lint fixes.
-    let (tsc, rest): (Vec<_>, Vec<_>) = self
+    // Prefer Deno fixes first, then TSC fixes, then Deno lint fixes.
+    let (deno, rest): (Vec<_>, Vec<_>) = self
       .actions
-      .into_iter()
-      .partition(|a| matches!(a, CodeActionKind::Tsc(..)));
-    let (deno, deno_lint): (Vec<_>, Vec<_>) = rest
       .into_iter()
       .partition(|a| matches!(a, CodeActionKind::Deno(_)));
-
-    tsc
+    let (tsc, deno_lint): (Vec<_>, Vec<_>) = rest
       .into_iter()
-      .chain(deno)
+      .partition(|a| matches!(a, CodeActionKind::Tsc(..)));
+
+    deno
+      .into_iter()
+      .chain(tsc)
       .chain(deno_lint)
       .map(|k| match k {
         CodeActionKind::Deno(c) => lsp::CodeActionOrCommand::CodeAction(c),
diff --git a/tests/integration/lsp_tests.rs b/tests/integration/lsp_tests.rs
index 9ddaebc599..852f56e9b3 100644
--- a/tests/integration/lsp_tests.rs
+++ b/tests/integration/lsp_tests.rs
@@ -4698,18 +4698,18 @@ fn test_lsp_code_actions_ordering() {
   }
   let res = serde_json::to_value(actions).unwrap();
 
-  // Ensure ordering is "deno-ts" -> "deno" -> "deno-lint".
+  // Ensure ordering is "deno" -> "deno-ts" -> "deno-lint".
   assert_eq!(
     res,
     json!([
-      {
-        "title": "Add async modifier to containing function",
-        "source": "deno-ts",
-      },
       {
         "title": "Cache \"https://deno.land/x/a/mod.ts\" and its dependencies.",
         "source": "deno",
       },
+      {
+        "title": "Add async modifier to containing function",
+        "source": "deno-ts",
+      },
       {
         "title": "Disable prefer-const for this line",
         "source": "deno-lint",