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.

gpui_macos: Fix glyph rendering when fonts share a PostScript name (#57250)

Ankan Misra20a93f6195ca
diff --git a/crates/gpui_macos/src/text_system.rs b/crates/gpui_macos/src/text_system.rs
index 2808e535ad5..fbc48864ce5 100644
--- a/crates/gpui_macos/src/text_system.rs
+++ b/crates/gpui_macos/src/text_system.rs
@@ -1,6 +1,6 @@
use anyhow::anyhow;
use cocoa::appkit::CGFloat;
-use collections::HashMap;
+use collections::{HashMap, HashSet};
use core_foundation::{
array::{CFArray, CFArrayRef},
attributed_string::CFMutableAttributedString,
@@ -282,6 +282,7 @@ impl MacTextSystemState {
let name = gpui::font_name_with_fallbacks(name, ".AppleSystemUIFont");
let mut font_ids = SmallVec::new();
+ let mut postscript_names_seen = HashSet::default();
let family = self
.memory_source
.select_family_by_name(name)
@@ -340,15 +341,38 @@ impl MacTextSystemState {
.is_some())
} {
log::error!(
- "Failed to read traits for font {:?}",
- font.postscript_name().unwrap()
+ "Failed to read traits for font {:?} (PostScript name {:?})",
+ font.full_name(),
+ font.postscript_name(),
);
continue;
}
+ let Some(postscript_name) = font.postscript_name() else {
+ log::warn!(
+ "font {:?} in family {:?} has no PostScript name; skipping",
+ font.full_name(),
+ name,
+ );
+ continue;
+ };
+ // Dedup is scoped to this single `load_family` call (issue #55472).
+ // The same family can be reloaded later under a different `FontKey`
+ // (different features/fallbacks); a global check against
+ // `font_ids_by_postscript_name` would skip every already-registered
+ // font and leave the second call's `font_ids` empty.
+ if !postscript_names_seen.insert(postscript_name.clone()) {
+ log::warn!(
+ "skipping duplicate font {:?} with PostScript name {:?} \
+ in family {:?}",
+ font.full_name(),
+ postscript_name,
+ name,
+ );
+ continue;
+ }
let font_id = FontId(self.fonts.len());
font_ids.push(font_id);
- let postscript_name = font.postscript_name().unwrap();
self.font_ids_by_postscript_name
.insert(postscript_name.clone(), font_id);
self.postscript_names_by_font_id