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

Avoid validating/reinstalling server which refuses will_fetch/start

Browse source 
These adapters have indicated some broader reason to the user why
they cannot be started, don't waste time/bandwidth attempting to
validate and reinstall them
This commit is contained in:
Julia 2023-06-24 22:42:06 -04:00
parent 7caa096bd0
commit c4b83c86cc
2 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -583,7 +583,7 @@ struct LanguageRegistryState {
pub struct PendingLanguageServer {
pub server_id: LanguageServerId,
pub task: Task<Result<lsp::LanguageServer>>,
pub task: Task<Result<Option<lsp::LanguageServer>>>,
pub container_dir: Option<Arc<Path>>,
}
@ -896,7 +896,8 @@ impl LanguageRegistry {
}
})
.detach();
Ok(server)
Ok(Some(server))
});
return Some(PendingLanguageServer {
@ -944,19 +945,24 @@ impl LanguageRegistry {
.clone();
drop(lock);
let binaries = entry.clone().map_err(|e| anyhow!(e)).await?;
let binary = match entry.clone().await.log_err() {
Some(binary) => binary,
None => return Ok(None),
};
if let Some(task) = adapter.will_start_server(&delegate, &mut cx) {
task.await?;
if task.await.log_err().is_none() {
return Ok(None);
}
}
lsp::LanguageServer::new(
Ok(Some(lsp::LanguageServer::new(
server_id,
binaries,
binary,
&root_path,
adapter.code_action_kinds(),
cx,
)
)?))
})
};