Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

markdown: Fix default UI font rendering in Mermaid diagrams (#56695)

Danilo Leal29db565437e3
diff --git a/crates/markdown/src/mermaid.rs b/crates/markdown/src/mermaid.rs
index 2c08191ac3d..250edeea3a5 100644
--- a/crates/markdown/src/mermaid.rs
+++ b/crates/markdown/src/mermaid.rs
@@ -162,12 +162,16 @@ fn hsla_to_hex(color: Hsla) -> String {
format!("#{r:02x}{g:02x}{b:02x}")
}
+fn mermaid_font_family(font_family: &str) -> &str {
+ gpui::font_name_with_fallbacks(font_family, "system-ui")
+}
+
fn build_mermaid_theme(cx: &Context<Markdown>) -> mermaid_rs_renderer::Theme {
let colors = cx.theme().colors();
let theme_settings = ThemeSettings::get_global(cx);
let mut theme = mermaid_rs_renderer::Theme::modern();
- theme.font_family = theme_settings.ui_font.family.to_string();
+ theme.font_family = mermaid_font_family(theme_settings.ui_font.family.as_ref()).to_string();
theme.background = hsla_to_hex(colors.editor_background);
theme.primary_color = hsla_to_hex(colors.surface_background);
theme.primary_text_color = hsla_to_hex(colors.text);
@@ -686,6 +690,15 @@ mod tests {
MermaidState::get_fallback_image(idx, old_full_order, new_full_order.len(), cache)
}
+ #[test]
+ fn test_mermaid_font_family_resolves_zed_virtual_fonts() {
+ assert_eq!(super::mermaid_font_family(".ZedSans"), "IBM Plex Sans");
+ assert_eq!(super::mermaid_font_family("Zed Plex Sans"), "IBM Plex Sans");
+ assert_eq!(super::mermaid_font_family(".ZedMono"), "Lilex");
+ assert_eq!(super::mermaid_font_family(".SystemUIFont"), "system-ui");
+ assert_eq!(super::mermaid_font_family("Custom Font"), "Custom Font");
+ }
+
#[test]
fn test_parse_mermaid_info() {
assert_eq!(parse_mermaid_info("mermaid"), Some(100));