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

Fix failing tests

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Julia 2023-04-19 15:57:20 -04:00 • committed by Max Brunsfeld
parent 6156dbced0
commit df94aee758
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/language/src/language.rs
View file

@ -817,7 +817,9 @@ impl LanguageRegistry {
.detach(); .detach();
Ok(server) 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 let download_dir = self

4
crates/project/src/project_tests.rs
View file

@ -400,7 +400,7 @@ async fn test_managing_language_servers(
.text_document, .text_document,
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/test.rs").unwrap(), uri: lsp::Url::from_file_path("/the-root/test.rs").unwrap(),
version: 1, version: 0,
text: rust_buffer.read_with(cx, |buffer, _| buffer.text()), text: rust_buffer.read_with(cx, |buffer, _| buffer.text()),
language_id: Default::default() language_id: Default::default()
} }
@ -427,7 +427,7 @@ async fn test_managing_language_servers(
}, },
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/test3.json").unwrap(), uri: lsp::Url::from_file_path("/the-root/test3.json").unwrap(),
version: 1, version: 0,
text: rust_buffer2.read_with(cx, |buffer, _| buffer.text()), text: rust_buffer2.read_with(cx, |buffer, _| buffer.text()),
language_id: Default::default() language_id: Default::default()
} }

6
crates/zed/src/languages/typescript.rs
View file

@ -1,11 +1,11 @@
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use async_trait::async_trait; use async_trait::async_trait;
use futures::{future::BoxFuture, FutureExt, StreamExt}; use futures::{future::BoxFuture, FutureExt};
use gpui::{AppContext, Task}; use gpui::AppContext;
use language::{LanguageServerBinary, LanguageServerName, LspAdapter}; use language::{LanguageServerBinary, LanguageServerName, LspAdapter};
use lsp::CodeActionKind; use lsp::CodeActionKind;
use node_runtime::NodeRuntime; use node_runtime::NodeRuntime;
use serde_json::{json, Map, Value}; use serde_json::{json, Value};
use smol::fs; use smol::fs;
use std::{ use std::{
any::Any, any::Any,