Avoid panic when language server is dropped before being initialized in tests
Co-authored-by: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
parent
45b6a9df36
commit
3dee656490
3 changed files with 16 additions and 7 deletions
|
@ -289,10 +289,13 @@ impl LanguageRegistry {
|
||||||
let servers_tx = servers_tx.clone();
|
let servers_tx = servers_tx.clone();
|
||||||
cx.background()
|
cx.background()
|
||||||
.spawn(async move {
|
.spawn(async move {
|
||||||
fake_server
|
if fake_server
|
||||||
.receive_notification::<lsp::notification::Initialized>()
|
.try_receive_notification::<lsp::notification::Initialized>()
|
||||||
.await;
|
.await
|
||||||
servers_tx.unbounded_send(fake_server).ok();
|
.is_some()
|
||||||
|
{
|
||||||
|
servers_tx.unbounded_send(fake_server).ok();
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.detach();
|
.detach();
|
||||||
Ok(server)
|
Ok(server)
|
||||||
|
|
|
@ -647,12 +647,18 @@ impl FakeLanguageServer {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn receive_notification<T: notification::Notification>(&mut self) -> T::Params {
|
pub async fn receive_notification<T: notification::Notification>(&mut self) -> T::Params {
|
||||||
|
self.try_receive_notification::<T>().await.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn try_receive_notification<T: notification::Notification>(
|
||||||
|
&mut self,
|
||||||
|
) -> Option<T::Params> {
|
||||||
use futures::StreamExt as _;
|
use futures::StreamExt as _;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let (method, params) = self.notifications_rx.next().await.unwrap();
|
let (method, params) = self.notifications_rx.next().await?;
|
||||||
if &method == T::METHOD {
|
if &method == T::METHOD {
|
||||||
return serde_json::from_str::<T::Params>(¶ms).unwrap();
|
return Some(serde_json::from_str::<T::Params>(¶ms).unwrap());
|
||||||
} else {
|
} else {
|
||||||
log::info!("skipping message in fake language server {:?}", params);
|
log::info!("skipping message in fake language server {:?}", params);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6550,7 +6550,7 @@ mod tests {
|
||||||
assert!(results.is_empty());
|
assert!(results.is_empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[gpui::test]
|
#[gpui::test(iterations = 10)]
|
||||||
async fn test_definition(cx: &mut gpui::TestAppContext) {
|
async fn test_definition(cx: &mut gpui::TestAppContext) {
|
||||||
let mut language = Language::new(
|
let mut language = Language::new(
|
||||||
LanguageConfig {
|
LanguageConfig {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue