Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix related documents diagnostics

Browse source 
They were converted to LSP position using the current file's line index, which is obviously wrong.
This commit is contained in:
Chayim Refael Friedman 2024-11-16 21:17:15 +02:00
parent 9224ec4497
commit 72e280a5e7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/rust-analyzer/src/handlers/request.rs
View file

@ -511,12 +511,16 @@ pub(crate) fn handle_document_diagnostics(
.into_iter()
.filter_map(|d| {
let file = d.range.file_id;
let diagnostic = convert_diagnostic(&line_index, d);
if file == file_id {
let diagnostic = convert_diagnostic(&line_index, d);
return Some(diagnostic);
}
if supports_related {
related_documents.entry(file).or_insert_with(Vec::new).push(diagnostic);
let (diagnostics, line_index) = related_documents
.entry(file)
.or_insert_with(|| (Vec::new(), snap.file_line_index(file).ok()));
let diagnostic = convert_diagnostic(line_index.as_mut()?, d);
diagnostics.push(diagnostic);
}
None
});
@ -529,7 +533,7 @@ pub(crate) fn handle_document_diagnostics(
related_documents: related_documents.is_empty().not().then(|| {
related_documents
.into_iter()
.map(|(id, items)| {
.map(|(id, (items, _))| {
(
to_proto::url(&snap, id),
lsp_types::DocumentDiagnosticReportKind::Full(