Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
diagnostics: Show source and code on related diagnostics (#56147)
Xin Zhao0c8236815a71
diff --git a/crates/diagnostics/src/diagnostic_renderer.rs b/crates/diagnostics/src/diagnostic_renderer.rsindex e1068e9c3be..b86b691546d 100644--- a/crates/diagnostics/src/diagnostic_renderer.rs+++ b/crates/diagnostics/src/diagnostic_renderer.rs@@ -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 {@@ -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}))"@@ -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,