mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't send error notifications for workspace failures if server status is supported

Browse Source
This commit is contained in:
Lukas Wirth 2023-03-08 13:18:44 +01:00
parent c9786484c5
commit b4bd27be90
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/rust-analyzer/src/main_loop.rs
View File

@ -409,12 +409,12 @@ impl GlobalState {
if self.last_reported_status.as_ref() != Some(&status) {
self.last_reported_status = Some(status.clone());
if let (lsp_ext::Health::Error, Some(message)) = (status.health, &status.message) {
self.show_message(lsp_types::MessageType::ERROR, message.clone());
}
if self.config.server_status_notification() {
self.send_notification::<lsp_ext::ServerStatusNotification>(status);
} else {
if let (lsp_ext::Health::Error, Some(message)) = (status.health, &status.message) {
self.show_message(lsp_types::MessageType::ERROR, message.clone());
}
}
}

4
crates/rust-analyzer/src/reload.rs
View File

@ -202,7 +202,9 @@ impl GlobalState {
tracing::info!(%cause, "will switch workspaces");
if let Err(error_message) = self.fetch_workspace_error() {
self.show_and_log_error(error_message, None);
if !self.config.server_status_notification() {
self.show_and_log_error(error_message, None);
}
if !self.workspaces.is_empty() {
// It only makes sense to switch to a partially broken workspace
// if we don't have any workspace at all yet.