diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs index 7064fa5055..38548c02db 100644 --- a/crates/language/src/language.rs +++ b/crates/language/src/language.rs @@ -817,7 +817,9 @@ impl LanguageRegistry { .detach(); Ok(server) }); - return vec![PendingLanguageServer { server_id: 0, task }]; + + let server_id = post_inc(&mut self.state.write().next_language_server_id); + return vec![PendingLanguageServer { server_id, task }]; } let download_dir = self diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs index b3a7cc88b8..b6e9741aec 100644 --- a/crates/project/src/project_tests.rs +++ b/crates/project/src/project_tests.rs @@ -400,7 +400,7 @@ async fn test_managing_language_servers( .text_document, lsp::TextDocumentItem { uri: lsp::Url::from_file_path("/the-root/test.rs").unwrap(), - version: 1, + version: 0, text: rust_buffer.read_with(cx, |buffer, _| buffer.text()), language_id: Default::default() } @@ -427,7 +427,7 @@ async fn test_managing_language_servers( }, lsp::TextDocumentItem { uri: lsp::Url::from_file_path("/the-root/test3.json").unwrap(), - version: 1, + version: 0, text: rust_buffer2.read_with(cx, |buffer, _| buffer.text()), language_id: Default::default() } diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs index ceb1d85402..4587aa5bfd 100644 --- a/crates/zed/src/languages/typescript.rs +++ b/crates/zed/src/languages/typescript.rs @@ -1,11 +1,11 @@ use anyhow::{anyhow, Result}; use async_trait::async_trait; -use futures::{future::BoxFuture, FutureExt, StreamExt}; -use gpui::{AppContext, Task}; +use futures::{future::BoxFuture, FutureExt}; +use gpui::AppContext; use language::{LanguageServerBinary, LanguageServerName, LspAdapter}; use lsp::CodeActionKind; use node_runtime::NodeRuntime; -use serde_json::{json, Map, Value}; +use serde_json::{json, Value}; use smol::fs; use std::{ any::Any,