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

Adjust message when pointing at location in macro

Browse Source
This commit is contained in:
Jonas Schievink 2021-04-01 14:44:20 +02:00
parent 7c87e49638
commit 066330e953
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/rust-analyzer/src/diagnostics/to_proto.rs
View File

@ -254,14 +254,22 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
let span_stack = std::iter::successors(Some(*primary_span), |span| {
Some(&span.expansion.as_ref()?.span)
});
for span in span_stack {
for (i, span) in span_stack.enumerate() {
// First span is the original diagnostic, others are macro call locations that
// generated that code.
let is_in_macro_call = i != 0;
let secondary_location = location(workspace_root, &span);
if secondary_location == primary_location {
continue;
}
related_info_macro_calls.push(lsp_types::DiagnosticRelatedInformation {
location: secondary_location.clone(),
message: "Error originated from macro call here".to_string(),
message: if is_in_macro_call {
"Error originated from macro call here".to_string()
} else {
"Actual error occurred here".to_string()
},
});
// For the additional in-macro diagnostic we add the inverse message pointing to the error location in code.
let information_for_additional_diagnostic =