Handle diagnostics with multiple primary spans

1 files changed, 16 insertions, 16 deletions

diff --git a/crates/ra_cargo_watch/src/lib.rs b/crates/ra_cargo_watch/src/lib.rs
index f07c34549..94b9c03d0 100644
--- a/crates/ra_cargo_watch/src/lib.rs
+++ b/crates/ra_cargo_watch/src/lib.rs
@@ -197,23 +197,23 @@ impl CheckWatcherThread {
             }
 
             CheckEvent::Msg(Message::CompilerMessage(msg)) => {
-                let map_result =
-                    match map_rust_diagnostic_to_lsp(&msg.message, &self.workspace_root) {
-                        Some(map_result) => map_result,
-                        None => return,
-                    };
-
-                let MappedRustDiagnostic { location, diagnostic, fixes } = map_result;
-                let fixes = fixes
-                    .into_iter()
-                    .map(|fix| {
-                        CodeAction { diagnostics: Some(vec![diagnostic.clone()]), ..fix }.into()
-                    })
-                    .collect();
+                let map_result = map_rust_diagnostic_to_lsp(&msg.message, &self.workspace_root);
+                if map_result.is_empty() {
+                    return;
+                }
 
-                task_send
-                    .send(CheckTask::AddDiagnostic { url: location.uri, diagnostic, fixes })
-                    .unwrap();
+                for MappedRustDiagnostic { location, diagnostic, fixes } in map_result {
+                    let fixes = fixes
+                        .into_iter()
+                        .map(|fix| {
+                            CodeAction { diagnostics: Some(vec![diagnostic.clone()]), ..fix }.into()
+                        })
+                        .collect();
+
+                    task_send
+                        .send(CheckTask::AddDiagnostic { url: location.uri, diagnostic, fixes })
+                        .unwrap();
+                }
             }
 
             CheckEvent::Msg(Message::BuildScriptExecuted(_msg)) => {}