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

Merge pull request #18519 from ChayimFriedman2/invalid-offset

Browse source 
fix: Fix related documents diagnostics
This commit is contained in:
Laurențiu Nicola 2024-11-17 07:06:29 +00:00 committed by GitHub
commit ba56d9b9b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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() .into_iter()
.filter_map(|d| { .filter_map(|d| {
let file = d.range.file_id; let file = d.range.file_id;
let diagnostic = convert_diagnostic(&line_index, d);
if file == file_id { if file == file_id {
let diagnostic = convert_diagnostic(&line_index, d);
return Some(diagnostic); return Some(diagnostic);
} }
if supports_related { 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 None
}); });
@ -529,7 +533,7 @@ pub(crate) fn handle_document_diagnostics(
related_documents: related_documents.is_empty().not().then(|| { related_documents: related_documents.is_empty().not().then(|| {
related_documents related_documents
.into_iter() .into_iter()
.map(|(id, items)| { .map(|(id, (items, _))| {
( (
to_proto::url(&snap, id), to_proto::url(&snap, id),
lsp_types::DocumentDiagnosticReportKind::Full( lsp_types::DocumentDiagnosticReportKind::Full(