Skip to content

diagnostics: Show source and code on related diagnostics #56147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Veykril merged 5 commits into from
Jun 1, 2026
Merged

diagnostics: Show source and code on related diagnostics #56147

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40d2f25
try to get a fix
lingyaochu May 8, 2026
6d7b2d1
Merge branch 'main' into diagnostics_info_append
lingyaochu May 12, 2026
7eda5cf
Merge branch 'main' into diagnostics_info_append
lingyaochu May 18, 2026
e3bcb62
Merge branch 'main' into diagnostics_info_append
lingyaochu May 24, 2026
81e240d
Merge branch 'main' into diagnostics_info_append
lingyaochu Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions crates/diagnostics/src/diagnostic_renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,7 @@ impl DiagnosticRenderer {
let mut markdown = Self::markdown(&entry.diagnostic);
if entry.diagnostic.is_primary {
let diagnostic = &primary.diagnostic;
if diagnostic.source.is_some() || diagnostic.code.is_some() {
markdown.push_str(" (");
}
if let Some(source) = diagnostic.source.as_ref() {
markdown.push_str(&Markdown::escape(source));
}
if diagnostic.source.is_some() && diagnostic.code.is_some() {
markdown.push(' ');
}
if let Some(code) = diagnostic.code.as_ref() {
if let Some(description) = diagnostic.code_description.as_ref() {
markdown.push('[');
markdown.push_str(&Markdown::escape(&code.to_string()));
markdown.push_str("](");
markdown.push_str(&Markdown::escape(description.as_ref()));
markdown.push(')');
} else {
markdown.push_str(&Markdown::escape(&code.to_string()));
}
}
if diagnostic.source.is_some() || diagnostic.code.is_some() {
markdown.push(')');
}
append_source_and_code(&mut markdown, diagnostic);

for (ix, entry) in diagnostic_group.iter().enumerate() {
if entry.range.start.row.abs_diff(primary.range.start.row) >= 5 {
Expand All @@ -84,6 +62,8 @@ impl DiagnosticRenderer {
}),
});
} else {
append_source_and_code(&mut markdown, entry.diagnostic);

if entry.range.start.row.abs_diff(primary.range.start.row) >= 5 {
markdown.push_str(&format!(
" ([back](file://#diagnostic-{buffer_id}-{group_id}-{primary_ix}))"
Expand Down Expand Up @@ -116,6 +96,31 @@ impl DiagnosticRenderer {
}
}

fn append_source_and_code(markdown: &mut String, diagnostic: &Diagnostic) {
if diagnostic.source.is_none() && diagnostic.code.is_none() {
return;
}
markdown.push_str(" (");
if let Some(source) = diagnostic.source.as_ref() {
markdown.push_str(&Markdown::escape(source));
}
if diagnostic.source.is_some() && diagnostic.code.is_some() {
markdown.push(' ');
}
if let Some(code) = diagnostic.code.as_ref() {
if let Some(description) = diagnostic.code_description.as_ref() {
markdown.push('[');
markdown.push_str(&Markdown::escape(&code.to_string()));
markdown.push_str("](");
markdown.push_str(&Markdown::escape(description.as_ref()));
markdown.push(')');
} else {
markdown.push_str(&Markdown::escape(&code.to_string()));
}
}
markdown.push(')');
}

impl editor::DiagnosticRenderer for DiagnosticRenderer {
fn render_group(
&self,
Expand Down
Loading