diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-11 00:39:44 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-11 00:39:44 +0100 |
commit | 539659cde36af73eb7a3a0795bb71b0d66f7d7cd (patch) | |
tree | 7986dee8ec73d21f624822530b0224681ab61806 | |
parent | 343b9c6e76919c255466fd9b12fc7fd46f59022e (diff) | |
parent | e6ea395fb0635dbe206d7004fb720dd84516bc4f (diff) |
Merge #5304
5304: Don't show error when speculatively reloading workspace r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | crates/rust-analyzer/src/reload.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs index 4e7d5be79..ab1b18ea9 100644 --- a/crates/rust-analyzer/src/reload.rs +++ b/crates/rust-analyzer/src/reload.rs | |||
@@ -126,10 +126,12 @@ impl GlobalState { | |||
126 | res.map_err(|err| { | 126 | res.map_err(|err| { |
127 | has_errors = true; | 127 | has_errors = true; |
128 | log::error!("failed to load workspace: {:#}", err); | 128 | log::error!("failed to load workspace: {:#}", err); |
129 | self.show_message( | 129 | if self.workspaces.is_empty() { |
130 | lsp_types::MessageType::Error, | 130 | self.show_message( |
131 | format!("rust-analyzer failed to load workspace: {:#}", err), | 131 | lsp_types::MessageType::Error, |
132 | ); | 132 | format!("rust-analyzer failed to load workspace: {:#}", err), |
133 | ); | ||
134 | } | ||
133 | }) | 135 | }) |
134 | .ok() | 136 | .ok() |
135 | }) | 137 | }) |