Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Julia 2023-04-19 15:57:51 -04:00 committed by Max Brunsfeld
parent 26abc824a9
commit c59204c5e6
2 changed files with 4 additions and 6 deletions

View file

@ -2161,8 +2161,7 @@ impl Project {
} }
if !self.language_server_ids.contains_key(&key) { if !self.language_server_ids.contains_key(&key) {
let adapter = self.setup_language_adapter( let adapter = self.setup_pending_language_server(
worktree_path.clone(),
initialization_options, initialization_options,
pending_server, pending_server,
adapter.clone(), adapter.clone(),
@ -2175,9 +2174,8 @@ impl Project {
} }
} }
fn setup_language_adapter( fn setup_pending_language_server(
&mut self, &mut self,
worktree_path: Arc<Path>,
initialization_options: Option<serde_json::Value>, initialization_options: Option<serde_json::Value>,
pending_server: PendingLanguageServer, pending_server: PendingLanguageServer,
adapter: Arc<CachedLspAdapter>, adapter: Arc<CachedLspAdapter>,

View file

@ -293,8 +293,8 @@ impl LspAdapter for EsLintLspAdapter {
async fn label_for_completion( async fn label_for_completion(
&self, &self,
item: &lsp::CompletionItem, _item: &lsp::CompletionItem,
language: &Arc<language::Language>, _language: &Arc<language::Language>,
) -> Option<language::CodeLabel> { ) -> Option<language::CodeLabel> {
None None
} }