fix(lsp): restore tsc's quick fix ordering (#20545)

1 files changed, 12 insertions, 20 deletions

diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs
index 808f09dec..c1def6012 100644
--- a/cli/lsp/analysis.rs
+++ b/cli/lsp/analysis.rs
@@ -848,31 +848,23 @@ impl CodeActionCollection {
 
   /// Move out the code actions and return them as a `CodeActionResponse`.
   pub fn get_response(self) -> lsp::CodeActionResponse {
-    let mut actions = self.actions;
-
     // Prefer TSC fixes first, then Deno fixes, then Deno lint fixes.
-    actions.sort_by(|a, b| match (a, b) {
-      (CodeActionKind::Deno(a), CodeActionKind::Deno(b)) => {
-        a.title.cmp(&b.title)
-      }
-      (CodeActionKind::DenoLint(a), CodeActionKind::DenoLint(b)) => {
-        a.title.cmp(&b.title)
-      }
-      (CodeActionKind::Tsc(a, _), CodeActionKind::Tsc(b, _)) => {
-        a.title.cmp(&b.title)
-      }
-      (CodeActionKind::Tsc(_, _), _) => Ordering::Less,
-      (CodeActionKind::Deno(_), CodeActionKind::Tsc(_, _)) => Ordering::Greater,
-      (CodeActionKind::Deno(_), CodeActionKind::DenoLint(_)) => Ordering::Less,
-      (CodeActionKind::DenoLint(_), _) => Ordering::Greater,
-    });
+    let (tsc, 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(_)));
 
-    actions
+    tsc
       .into_iter()
-      .map(|i| match i {
-        CodeActionKind::Tsc(c, _) => lsp::CodeActionOrCommand::CodeAction(c),
+      .chain(deno)
+      .chain(deno_lint)
+      .map(|k| match k {
         CodeActionKind::Deno(c) => lsp::CodeActionOrCommand::CodeAction(c),
         CodeActionKind::DenoLint(c) => lsp::CodeActionOrCommand::CodeAction(c),
+        CodeActionKind::Tsc(c, _) => lsp::CodeActionOrCommand::CodeAction(c),
       })
       .collect()
   }