1 files changed, 17 insertions, 2 deletions

diff --git a/crates/ra_cargo_watch/src/conv.rs b/crates/ra_cargo_watch/src/conv.rs
index dedb0751e..ac0f1d28a 100644
--- a/crates/ra_cargo_watch/src/conv.rs
+++ b/crates/ra_cargo_watch/src/conv.rs
@@ -50,15 +50,20 @@ fn map_macro_span_to_location(
     None
 }
 
-/// Converts a Rust span to a LSP location
+/// Converts a Rust span to a LSP location, resolving macro expansion site if neccesary
 fn map_span_to_location(span: &DiagnosticSpan, workspace_root: &PathBuf) -> Location {
-    if is_from_macro(&span.file_name) && span.expansion.is_some() {
+    if span.expansion.is_some() {
         let expansion = span.expansion.as_ref().unwrap();
         if let Some(macro_range) = map_macro_span_to_location(&expansion, workspace_root) {
             return macro_range;
         }
     }
 
+    map_span_to_location_naive(span, workspace_root)
+}
+
+/// Converts a Rust span to a LSP location
+fn map_span_to_location_naive(span: &DiagnosticSpan, workspace_root: &PathBuf) -> Location {
     let mut file_name = workspace_root.clone();
     file_name.push(&span.file_name);
     let uri = url_from_path_with_drive_lowercasing(file_name).unwrap();
@@ -228,6 +233,16 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
     let mut related_information = vec![];
     let mut tags = vec![];
 
+    // If error occurs from macro expansion, add related info pointing to
+    // where the error originated
+    if !is_from_macro(&primary_span.file_name) && primary_span.expansion.is_some() {
+        let def_loc = map_span_to_location_naive(&primary_span, workspace_root);
+        related_information.push(DiagnosticRelatedInformation {
+            location: def_loc,
+            message: "Error originated from macro here".to_string(),
+        });
+    }
+
     for secondary_span in rd.spans.iter().filter(|s| !s.is_primary) {
         let related = map_secondary_span_to_related(secondary_span, workspace_root);
         if let Some(related) = related {