From c59204c5e6f145baa12398218a55afc0d086a064 Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Wed, 19 Apr 2023 15:57:51 -0400
Subject: [PATCH] Cleanup

Co-Authored-By: Max Brunsfeld <max@zed.dev>
---
 crates/project/src/project.rs          | 6 ++----
 crates/zed/src/languages/typescript.rs | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index b0973f1b24b10989c85d50a50890d0a88246b9ea..3963c42c46b390aae5b2f450702db1e827ae9a01 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2161,8 +2161,7 @@ impl Project {
             }
 
             if !self.language_server_ids.contains_key(&key) {
-                let adapter = self.setup_language_adapter(
-                    worktree_path.clone(),
+                let adapter = self.setup_pending_language_server(
                     initialization_options,
                     pending_server,
                     adapter.clone(),
@@ -2175,9 +2174,8 @@ impl Project {
         }
     }
 
-    fn setup_language_adapter(
+    fn setup_pending_language_server(
         &mut self,
-        worktree_path: Arc<Path>,
         initialization_options: Option<serde_json::Value>,
         pending_server: PendingLanguageServer,
         adapter: Arc<CachedLspAdapter>,
diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs
index 4587aa5bfd730aed81dbc7ad77630da0d83b8552..b422e9992620c65f83ab038b33d3c897ad8965c0 100644
--- a/crates/zed/src/languages/typescript.rs
+++ b/crates/zed/src/languages/typescript.rs
@@ -293,8 +293,8 @@ impl LspAdapter for EsLintLspAdapter {
 
     async fn label_for_completion(
         &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<language::Language>,
+        _item: &lsp::CompletionItem,
+        _language: &Arc<language::Language>,
     ) -> Option<language::CodeLabel> {
         None
     }