Avoid validating/reinstalling server which refuses will_fetch/start

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

View file

@ -583,7 +583,7 @@ struct LanguageRegistryState {
pub struct PendingLanguageServer { pub struct PendingLanguageServer {
pub server_id: LanguageServerId, pub server_id: LanguageServerId,
pub task: Task<Result<lsp::LanguageServer>>, pub task: Task<Result<Option<lsp::LanguageServer>>>,
pub container_dir: Option<Arc<Path>>, pub container_dir: Option<Arc<Path>>,
} }
@ -896,7 +896,8 @@ impl LanguageRegistry {
} }
}) })
.detach(); .detach();
Ok(server)
Ok(Some(server))
}); });
return Some(PendingLanguageServer { return Some(PendingLanguageServer {
@ -944,19 +945,24 @@ impl LanguageRegistry {
.clone(); .clone();
drop(lock); 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) { 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, server_id,
binaries, binary,
&root_path, &root_path,
adapter.code_action_kinds(), adapter.code_action_kinds(),
cx, cx,
) )?))
}) })
}; };

View file

@ -2471,7 +2471,7 @@ impl Project {
.await; .await;
match result { match result {
Ok(server) => Some(server), Ok(server) => server,
Err(err) => { Err(err) => {
log::error!("failed to start language server {:?}: {}", server_name, err); log::error!("failed to start language server {:?}: {}", server_name, err);
@ -2571,8 +2571,8 @@ impl Project {
server_id: LanguageServerId, server_id: LanguageServerId,
key: (WorktreeId, LanguageServerName), key: (WorktreeId, LanguageServerName),
cx: &mut AsyncAppContext, cx: &mut AsyncAppContext,
) -> Result<Arc<LanguageServer>> { ) -> Result<Option<Arc<LanguageServer>>> {
let language_server = Self::setup_pending_language_server( let setup = Self::setup_pending_language_server(
this, this,
initialization_options, initialization_options,
pending_server, pending_server,
@ -2580,8 +2580,12 @@ impl Project {
languages, languages,
server_id, server_id,
cx, cx,
) );
.await?;
let language_server = match setup.await? {
Some(language_server) => language_server,
None => return Ok(None),
};
let this = match this.upgrade(cx) { let this = match this.upgrade(cx) {
Some(this) => this, Some(this) => this,
@ -2599,7 +2603,7 @@ impl Project {
) )
})?; })?;
Ok(language_server) Ok(Some(language_server))
} }
async fn setup_pending_language_server( async fn setup_pending_language_server(
@ -2610,11 +2614,13 @@ impl Project {
languages: Arc<LanguageRegistry>, languages: Arc<LanguageRegistry>,
server_id: LanguageServerId, server_id: LanguageServerId,
cx: &mut AsyncAppContext, cx: &mut AsyncAppContext,
) -> Result<Arc<LanguageServer>> { ) -> Result<Option<Arc<LanguageServer>>> {
let workspace_config = cx.update(|cx| languages.workspace_configuration(cx)).await; let workspace_config = cx.update(|cx| languages.workspace_configuration(cx)).await;
let language_server = pending_server.task.await?; let language_server = match pending_server.task.await? {
let language_server = language_server.initialize(initialization_options).await?; Some(server) => server.initialize(initialization_options).await?,
None => return Ok(None),
};
language_server language_server
.on_notification::<lsp::notification::LogMessage, _>({ .on_notification::<lsp::notification::LogMessage, _>({
@ -2756,7 +2762,7 @@ impl Project {
) )
.ok(); .ok();
Ok(language_server) Ok(Some(language_server))
} }
fn insert_newly_running_language_server( fn insert_newly_running_language_server(