Overhaul handling of font families

* Specify font families in the theme.
* Load fonts eagerly when loading themes, instead of loading
  them lazily when rendering.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

zed/src/theme/highlight_map.rs

@@ -1,4 +1,4 @@
-use super::Theme;
+use super::SyntaxTheme;
 use std::sync::Arc;
 
 #[derive(Clone, Debug)]
@@ -10,7 +10,7 @@ pub struct HighlightId(pub u32);
 const DEFAULT_HIGHLIGHT_ID: HighlightId = HighlightId(u32::MAX);
 
 impl HighlightMap {
-    pub fn new(capture_names: &[String], theme: &Theme) -> Self {
+    pub fn new(capture_names: &[String], theme: &SyntaxTheme) -> Self {
         // For each capture name in the highlight query, find the longest
         // key in the theme's syntax styles that matches all of the
         // dot-separated components of the capture name.
@@ -19,7 +19,7 @@ impl HighlightMap {
                 .iter()
                 .map(|capture_name| {
                     theme
-                        .syntax
+                        .highlights
                         .iter()
                         .enumerate()
                         .filter_map(|(i, (key, _))| {
@@ -68,9 +68,9 @@ mod tests {
 
     #[test]
     fn test_highlight_map() {
-        let theme = Theme {
-            name: "test".into(),
-            syntax: [
+        let theme = SyntaxTheme::new(
+            Default::default(),
+            [
                 ("function", Color::from_u32(0x100000ff)),
                 ("function.method", Color::from_u32(0x200000ff)),
                 ("function.async", Color::from_u32(0x300000ff)),
@@ -81,8 +81,7 @@ mod tests {
             .iter()
             .map(|(name, color)| (name.to_string(), (*color).into()))
             .collect(),
-            ..Default::default()
-        };
+        );
 
         let capture_names = &[
             "function.special".to_string(),

zed/src/theme/theme_registry.rs

@@ -1,5 +1,5 @@
 use anyhow::{anyhow, Context, Result};
-use gpui::AssetSource;
+use gpui::{fonts, AssetSource, FontCache};
 use json::{Map, Value};
 use parking_lot::Mutex;
 use serde_json as json;
@@ -11,6 +11,7 @@ pub struct ThemeRegistry {
     assets: Box<dyn AssetSource>,
     themes: Mutex<HashMap<String, Arc<Theme>>>,
     theme_data: Mutex<HashMap<String, Arc<Value>>>,
+    font_cache: Arc<FontCache>,
 }
 
 #[derive(Default)]
@@ -38,11 +39,12 @@ enum Key {
 }
 
 impl ThemeRegistry {
-    pub fn new(source: impl AssetSource) -> Arc<Self> {
+    pub fn new(source: impl AssetSource, font_cache: Arc<FontCache>) -> Arc<Self> {
         Arc::new(Self {
             assets: Box::new(source),
             themes: Default::default(),
             theme_data: Default::default(),
+            font_cache,
         })
     }
 
@@ -69,7 +71,10 @@ impl ThemeRegistry {
         }
 
         let theme_data = self.load(name, true)?;
-        let mut theme = serde_json::from_value::<Theme>(theme_data.as_ref().clone())?;
+        let mut theme = fonts::with_font_cache(self.font_cache.clone(), || {
+            serde_json::from_value::<Theme>(theme_data.as_ref().clone())
+        })?;
+
         theme.name = name.into();
         let theme = Arc::new(theme);
         self.themes.lock().insert(name.to_string(), theme.clone());
@@ -512,11 +517,12 @@ fn value_at<'a>(object: &'a mut Map<String, Value>, key_path: &KeyPath) -> Optio
 mod tests {
     use super::*;
     use crate::{assets::Assets, theme::DEFAULT_THEME_NAME};
+    use gpui::MutableAppContext;
     use rand::{prelude::StdRng, Rng};
 
-    #[test]
-    fn test_bundled_themes() {
-        let registry = ThemeRegistry::new(Assets);
+    #[gpui::test]
+    fn test_bundled_themes(cx: &mut MutableAppContext) {
+        let registry = ThemeRegistry::new(Assets, cx.font_cache().clone());
         let mut has_default_theme = false;
         for theme_name in registry.list() {
             let theme = registry.get(&theme_name).unwrap();
@@ -528,8 +534,8 @@ mod tests {
         assert!(has_default_theme);
     }
 
-    #[test]
-    fn test_theme_extension() {
+    #[gpui::test]
+    fn test_theme_extension(cx: &mut MutableAppContext) {
         let assets = TestAssets(&[
             (
                 "themes/_base.toml",
@@ -568,7 +574,7 @@ mod tests {
             ),
         ]);
 
-        let registry = ThemeRegistry::new(assets);
+        let registry = ThemeRegistry::new(assets, cx.font_cache().clone());
         let theme_data = registry.load("light", true).unwrap();
         assert_eq!(
             theme_data.as_ref(),