Surpress more rust-analyzer error logs (#42299)

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Lukas Wirth
2025-11-09 11:27:16 +00:00
committed by GitHub
parent b7d4d1791a
commit 5d08c1b35f
5 changed files with 22 additions and 13 deletions
+1 -1
View File
@@ -98,7 +98,7 @@ impl LspInstaller for CLspAdapter {
})
.await
.inspect_err(|err| {
log::warn!("Unable to run {binary_path:?} asset, redownloading: {err}",)
log::warn!("Unable to run {binary_path:?} asset, redownloading: {err:#}",)
})
};
if let (Some(actual_digest), Some(expected_digest)) =
+2 -2
View File
@@ -263,7 +263,7 @@ impl LspInstaller for TyLspAdapter {
})
.await
.inspect_err(|err| {
log::warn!("Unable to run {server_path:?} asset, redownloading: {err}",)
log::warn!("Unable to run {server_path:?} asset, redownloading: {err:#}",)
})
};
if let (Some(actual_digest), Some(expected_digest)) =
@@ -2176,7 +2176,7 @@ impl LspInstaller for RuffLspAdapter {
})
.await
.inspect_err(|err| {
log::warn!("Unable to run {server_path:?} asset, redownloading: {err}",)
log::warn!("Unable to run {server_path:?} asset, redownloading: {err:#}",)
})
};
if let (Some(actual_digest), Some(expected_digest)) =
+1 -1
View File
@@ -529,7 +529,7 @@ impl LspInstaller for RustLspAdapter {
})
.await
.inspect_err(|err| {
log::warn!("Unable to run {server_path:?} asset, redownloading: {err}",)
log::warn!("Unable to run {server_path:?} asset, redownloading: {err:#}",)
})
};
if let (Some(actual_digest), Some(expected_digest)) =
+12 -5
View File
@@ -4519,7 +4519,6 @@ impl LspStore {
) {
Ok(LspParamsOrResponse::Params(lsp_params)) => lsp_params,
Ok(LspParamsOrResponse::Response(response)) => return Task::ready(Ok(response)),
Err(err) => {
let message = format!(
"{} via {} failed: {}",
@@ -4527,7 +4526,10 @@ impl LspStore {
language_server.name(),
err
);
log::warn!("{message}");
// rust-analyzer likes to error with this when its still loading up
if !message.ends_with("content modified") {
log::warn!("{message}");
}
return Task::ready(Err(anyhow!(message)));
}
};
@@ -4585,7 +4587,10 @@ impl LspStore {
language_server.name(),
err
);
log::warn!("{message}");
// rust-analyzer likes to error with this when its still loading up
if !message.ends_with("content modified") {
log::warn!("{message}");
}
anyhow::anyhow!(message)
})?;
@@ -6907,6 +6912,8 @@ impl LspStore {
let mut responses = Vec::new();
match server_task.await {
Ok(response) => responses.push((server_id, response)),
// rust-analyzer likes to error with this when its still loading up
Err(e) if format!("{e:#}").ends_with("content modified") => (),
Err(e) => log::error!(
"Error handling response for inlay hints request: {e:#}"
),
@@ -8433,7 +8440,7 @@ impl LspStore {
match response_result {
Ok(response) => responses.push((server_id, response)),
// rust-analyzer likes to error with this when its still loading up
Err(e) if e.to_string().ends_with("content modified") => (),
Err(e) if format!("{e:#}").ends_with("content modified") => (),
Err(e) => log::error!("Error handling response for request {request:?}: {e:#}"),
}
}
@@ -12428,7 +12435,7 @@ impl LspStore {
match server_task.await {
Ok(response) => responses.push((server_id, response)),
// rust-analyzer likes to error with this when its still loading up
Err(e) if e.to_string().ends_with("content modified") => (),
Err(e) if format!("{e:#}").ends_with("content modified") => (),
Err(e) => log::error!(
"Error handling response for request {request:?}: {e:#}"
),
+6 -4
View File
@@ -310,8 +310,8 @@ impl MarksState {
fn load(&mut self, cx: &mut Context<Self>) {
cx.spawn(async move |this, cx| {
let Some(workspace_id) = this.update(cx, |this, cx| this.workspace_id(cx))? else {
return Ok(());
let Some(workspace_id) = this.update(cx, |this, cx| this.workspace_id(cx)).ok()? else {
return None;
};
let (marks, paths) = cx
.background_spawn(async move {
@@ -319,10 +319,12 @@ impl MarksState {
let paths = DB.get_global_marks_paths(workspace_id)?;
anyhow::Ok((marks, paths))
})
.await?;
.await
.log_err()?;
this.update(cx, |this, cx| this.loaded(marks, paths, cx))
.ok()
})
.detach_and_log_err(cx);
.detach();
}
fn loaded(