Extract platform-dependant FontSystem

Co-Authored-By: Nathan Sobo <nathan@zed.dev>

zed/src/editor/buffer_view.rs

@@ -887,10 +887,7 @@ impl BufferView {
     pub fn em_width(&self, font_cache: &FontCache) -> f32 {
         let settings = smol::block_on(self.settings.read());
         let font_id = font_cache.default_font(settings.buffer_font_family);
-        let font = font_cache.font(font_id);
-        let glyph_id = font.glyph_for_char('m').unwrap();
-        let bounds = font.typographic_bounds(glyph_id).unwrap();
-        font_cache.scale_metric(bounds.width(), font_id, settings.buffer_font_size)
+        font_cache.em_width(font_id, settings.buffer_font_size)
     }
 
     // TODO: Can we make this not return a result?
@@ -914,7 +911,6 @@ impl BufferView {
                 "1".repeat(digit_count).as_str(),
                 font_size,
                 &[(0..digit_count, font_id)],
-                font_cache,
             )
             .width)
     }
@@ -959,7 +955,6 @@ impl BufferView {
                             &line_number,
                             font_size,
                             &[(0..line_number.len(), font_id)],
-                            font_cache,
                         );
                     }
                     Ok(())
@@ -1017,7 +1012,6 @@ impl BufferView {
                                 &line,
                                 font_size,
                                 &[(0..line_len, font_id)],
-                                font_cache,
                             );
                             line.clear();
                             line_len = 0;
@@ -1054,7 +1048,6 @@ impl BufferView {
             &line,
             settings.buffer_font_size,
             &[(0..self.line_len(row, app)? as usize, font_id)],
-            font_cache,
         ))
     }
 
@@ -1273,7 +1266,7 @@ mod tests {
     fn test_selection_with_mouse() {
         App::test((), |mut app| async move {
             let buffer = app.add_model(|_| Buffer::new(0, "aaaaaa\nbbbbbb\ncccccc\ndddddd\n"));
-            let settings = settings::channel(&FontCache::new()).unwrap().1;
+            let settings = settings::channel(&app.font_cache()).unwrap().1;
             let (_, buffer_view) =
                 app.add_window(|ctx| BufferView::for_buffer(buffer, settings, ctx));
 
@@ -1372,10 +1365,10 @@ mod tests {
     fn test_layout_line_numbers() -> Result<()> {
         use gpui::{fonts::FontCache, text_layout::TextLayoutCache};
 
-        let font_cache = FontCache::new();
-        let layout_cache = TextLayoutCache::new();
-
         App::test((), |mut app| async move {
+            let font_cache = FontCache::new(app.platform().fonts());
+            let layout_cache = TextLayoutCache::new(app.platform().fonts());
+
             let buffer = app.add_model(|_| Buffer::new(0, sample_text(6, 6)));
 
             let settings = settings::channel(&font_cache).unwrap().1;
@@ -1416,7 +1409,7 @@ mod tests {
                     .unindent(),
                 )
             });
-            let settings = settings::channel(&FontCache::new()).unwrap().1;
+            let settings = settings::channel(&app.font_cache()).unwrap().1;
             let (_, view) =
                 app.add_window(|ctx| BufferView::for_buffer(buffer.clone(), settings, ctx));
 
@@ -1488,7 +1481,7 @@ mod tests {
     fn test_move_cursor() -> Result<()> {
         App::test((), |mut app| async move {
             let buffer = app.add_model(|_| Buffer::new(0, sample_text(6, 6)));
-            let settings = settings::channel(&FontCache::new()).unwrap().1;
+            let settings = settings::channel(&app.font_cache()).unwrap().1;
             let (_, view) =
                 app.add_window(|ctx| BufferView::for_buffer(buffer.clone(), settings, ctx));
 

zed/src/file_finder.rs

@@ -409,7 +409,7 @@ mod tests {
             super::init(&mut app);
             editor::init(&mut app);
 
-            let settings = settings::channel(&app.fonts()).unwrap().1;
+            let settings = settings::channel(&app.font_cache()).unwrap().1;
             let workspace = app.add_model(|ctx| Workspace::new(vec![tmp_dir.path().into()], ctx));
             let (window_id, workspace_view) =
                 app.add_window(|ctx| WorkspaceView::new(workspace.clone(), settings, ctx));

zed/src/main.rs

@@ -12,7 +12,7 @@ fn main() {
     init_logger();
 
     let app = gpui::App::new(assets::Assets).unwrap();
-    let (_, settings_rx) = settings::channel(&app.fonts()).unwrap();
+    let (_, settings_rx) = settings::channel(&app.font_cache()).unwrap();
 
     {
         let mut app = app.clone();

zed/src/workspace/mod.rs

@@ -59,7 +59,7 @@ mod tests {
     #[test]
     fn test_open_paths_action() {
         App::test((), |mut app| async move {
-            let settings = settings::channel(&FontCache::new()).unwrap().1;
+            let settings = settings::channel(&app.font_cache()).unwrap().1;
 
             init(&mut app);
 

zed/src/workspace/workspace_view.rs

@@ -339,7 +339,7 @@ mod tests {
                 },
             }));
 
-            let settings = settings::channel(&FontCache::new()).unwrap().1;
+            let settings = settings::channel(&app.font_cache()).unwrap().1;
             let workspace = app.add_model(|ctx| Workspace::new(vec![dir.path().into()], ctx));
             app.finish_pending_tasks().await; // Open and populate worktree.
             let entries = workspace.file_entries(&app);
@@ -409,7 +409,7 @@ mod tests {
                 },
             }));
 
-            let settings = settings::channel(&FontCache::new()).unwrap().1;
+            let settings = settings::channel(&app.font_cache()).unwrap().1;
             let workspace = app.add_model(|ctx| Workspace::new(vec![dir.path().into()], ctx));
             app.finish_pending_tasks().await; // Open and populate worktree.
             let entries = workspace.file_entries(&app);