From 6fe393db2a3647ab49759a9dcba92c258ae76265 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 26 Oct 2023 14:48:04 +0200 Subject: [PATCH] Fix compile errors with lsp2 Co-authored-by: Jospeh --- crates/lsp2/src/lsp2.rs | 2 +- crates/project2/src/project2.rs | 2 +- crates/zed2/src/main.rs | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/lsp2/src/lsp2.rs b/crates/lsp2/src/lsp2.rs index a6a9a4f6394e5b3b862ab340e29be63a0dd5c183..27b7b36e738c8889f2cec43cede3c981b57dcb07 100644 --- a/crates/lsp2/src/lsp2.rs +++ b/crates/lsp2/src/lsp2.rs @@ -240,7 +240,7 @@ impl LanguageServer { let stderr_input_task = stderr .map(|stderr| { let io_handlers = io_handlers.clone(); - let stderr_captures = stderr_captures.clone(); + let stderr_captures = stderr_capture.clone(); cx.spawn(|_| Self::handle_stderr(stderr, io_handlers, stderr_captures).log_err()) }) .unwrap_or_else(|| Task::Ready(Some(None))); diff --git a/crates/project2/src/project2.rs b/crates/project2/src/project2.rs index 4e529923802a5eed3462a7fcb311b509267faed8..b0fde1c4865946e980ed7056d826b13b6fed81d9 100644 --- a/crates/project2/src/project2.rs +++ b/crates/project2/src/project2.rs @@ -2964,7 +2964,7 @@ impl Project { ) })??; - Ok(language_server) + Ok(Some(language_server)) } async fn setup_pending_language_server( diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index 69aecccd453351fd3f429ea67bf98fef2cc9dd55..44a441db0ba89a123fd18f40c942d751cbd0f97f 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -117,7 +117,6 @@ fn main() { let copilot_language_server_id = languages.next_language_server_id(); languages.set_executor(cx.executor().clone()); languages.set_language_server_download_dir(paths::LANGUAGES_DIR.clone()); - let languages = Arc::new(languages); let node_runtime = RealNodeRuntime::new(http.clone()); language2::init(cx);