Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile errors with lsp2

Browse source 
Co-authored-by: Jospeh <joseph@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-10-26 14:48:04 +02:00
parent 69e5ecc015
commit 6fe393db2a
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/lsp2/src/lsp2.rs
View file

@ -240,7 +240,7 @@ impl LanguageServer {
let stderr_input_task = stderr let stderr_input_task = stderr
.map(|stderr| { .map(|stderr| {
let io_handlers = io_handlers.clone(); 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()) cx.spawn(|_| Self::handle_stderr(stderr, io_handlers, stderr_captures).log_err())
}) })
.unwrap_or_else(|| Task::Ready(Some(None))); .unwrap_or_else(|| Task::Ready(Some(None)));

2
crates/project2/src/project2.rs
View file

@ -2964,7 +2964,7 @@ impl Project {
) )
})??; })??;
Ok(language_server) Ok(Some(language_server))
} }
async fn setup_pending_language_server( async fn setup_pending_language_server(

1
crates/zed2/src/main.rs
View file

@ -117,7 +117,6 @@ fn main() {
let copilot_language_server_id = languages.next_language_server_id(); let copilot_language_server_id = languages.next_language_server_id();
languages.set_executor(cx.executor().clone()); languages.set_executor(cx.executor().clone());
languages.set_language_server_download_dir(paths::LANGUAGES_DIR.clone()); languages.set_language_server_download_dir(paths::LANGUAGES_DIR.clone());
let languages = Arc::new(languages);
let node_runtime = RealNodeRuntime::new(http.clone()); let node_runtime = RealNodeRuntime::new(http.clone());
language2::init(cx); language2::init(cx);