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

Show a notification when unable to start elixir-ls

Browse source
This commit is contained in:
Max Brunsfeld 2023-06-19 18:05:30 -07:00
parent 57c2d85c66
commit 1215de0c42
3 changed files with 85 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,12 +130,20 @@ impl CachedLspAdapter {
self.adapter.fetch_latest_server_version(delegate).await
}
pub fn will_fetch_server_binary(
pub fn will_fetch_server(
&self,
delegate: &Arc<dyn LspAdapterDelegate>,
cx: &mut AsyncAppContext,
) -> Option<Task<Result<()>>> {
self.adapter.will_fetch_server_binary(delegate, cx)
self.adapter.will_fetch_server(delegate, cx)
}
pub fn will_start_server(
&self,
delegate: &Arc<dyn LspAdapterDelegate>,
cx: &mut AsyncAppContext,
) -> Option<Task<Result<()>>> {
self.adapter.will_start_server(delegate, cx)
}
pub async fn fetch_server_binary(
@ -212,7 +220,15 @@ pub trait LspAdapter: 'static + Send + Sync {
delegate: &dyn LspAdapterDelegate,
) -> Result<Box<dyn 'static + Send + Any>>;
fn will_fetch_server_binary(
fn will_fetch_server(
&self,
_: &Arc<dyn LspAdapterDelegate>,
_: &mut AsyncAppContext,
) -> Option<Task<Result<()>>> {
None
}
fn will_start_server(
&self,
_: &Arc<dyn LspAdapterDelegate>,
_: &mut AsyncAppContext,
@ -891,7 +907,7 @@ impl LanguageRegistry {
let lsp_binary_statuses = self.lsp_binary_statuses_tx.clone();
let login_shell_env_loaded = self.login_shell_env_loaded.clone();
let task = cx.spawn(|cx| async move {
let task = cx.spawn(|mut cx| async move {
login_shell_env_loaded.await;
let entry = this
@ -903,7 +919,7 @@ impl LanguageRegistry {
get_binary(
adapter.clone(),
language.clone(),
delegate,
delegate.clone(),
download_dir,
lsp_binary_statuses,
cx,
@ -915,6 +931,10 @@ impl LanguageRegistry {
.clone();
let binary = entry.clone().map_err(|e| anyhow!(e)).await?;
if let Some(task) = adapter.will_start_server(&delegate, &mut cx) {
task.await?;
}
let server = lsp::LanguageServer::new(
server_id,
&binary.path,
@ -996,7 +1016,7 @@ async fn get_binary(
.context("failed to create container directory")?;
}
if let Some(task) = adapter.will_fetch_server_binary(&delegate, &mut cx) {
if let Some(task) = adapter.will_fetch_server(&delegate, &mut cx) {
task.await?;
}