Bundle and use Inconsolata v2.012

There's a newer version of the font available but ligatures seem
broken googlefonts/Inconsolata#58 and googlefonts/Inconsolata#52.

As part of this commit I also upgraded rust-embed to use the new
exclusion feature, which allows us to skip embedding OS files like
`.DS_Store`.

zed/Cargo.toml

@@ -38,7 +38,7 @@ parking_lot = "0.11.1"
 postage = { version = "0.4.1", features = ["futures-traits"] }
 rand = "0.8.3"
 rsa = "0.4"
-rust-embed = "5.9.0"
+rust-embed = { version = "6.2", features = ["include-exclude"] }
 seahash = "4.1"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1.0.64", features = ["preserve_order"] }

zed/assets/themes/dark.toml

@@ -6,7 +6,7 @@ extends = "_base"
 2 = "#131415"
 
 [text]
-base = { family = "Helvetica", size = 14.0 }
+base = { family = "Inconsolata", size = 14 }
 0 = { extends = "$text.base", color = "#ffffff" }
 1 = { extends = "$text.base", color = "#b3b3b3" }
 2 = { extends = "$text.base", color = "#7b7d80" }

zed/assets/themes/light.toml

@@ -7,7 +7,7 @@ extends = "_base"
 3 = "#3a3b3c"
 
 [text]
-base = { family = "Helvetica", size = 14.0 }
+base = { family = "Inconsolata", size = 14 }
 0 = { extends = "$text.base", color = "#acacac" }
 1 = { extends = "$text.base", color = "#111111" }
 2 = { extends = "$text.base", color = "#333333" }

zed/src/assets.rs

@@ -4,11 +4,14 @@ use rust_embed::RustEmbed;
 
 #[derive(RustEmbed)]
 #[folder = "assets"]
+#[exclude = "*.DS_Store"]
 pub struct Assets;
 
 impl AssetSource for Assets {
     fn load(&self, path: &str) -> Result<std::borrow::Cow<[u8]>> {
-        Self::get(path).ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
+        Self::get(path)
+            .map(|f| f.data)
+            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
     }
 
     fn list(&self, path: &str) -> Vec<std::borrow::Cow<'static, str>> {

zed/src/language.rs

@@ -47,7 +47,8 @@ impl Language {
 impl LanguageRegistry {
     pub fn new() -> Self {
         let grammar = tree_sitter_rust::language();
-        let rust_config = toml::from_slice(&LanguageDir::get("rust/config.toml").unwrap()).unwrap();
+        let rust_config =
+            toml::from_slice(&LanguageDir::get("rust/config.toml").unwrap().data).unwrap();
         let rust_language = Language {
             config: rust_config,
             grammar,
@@ -84,7 +85,7 @@ impl LanguageRegistry {
     fn load_query(grammar: tree_sitter::Language, path: &str) -> Query {
         Query::new(
             grammar,
-            str::from_utf8(LanguageDir::get(path).unwrap().as_ref()).unwrap(),
+            str::from_utf8(&LanguageDir::get(path).unwrap().data).unwrap(),
         )
         .unwrap()
     }

zed/src/main.rs

@@ -2,12 +2,14 @@
 #![allow(non_snake_case)]
 
 use fs::OpenOptions;
+use gpui::AssetSource;
 use log::LevelFilter;
 use parking_lot::Mutex;
 use simplelog::SimpleLogger;
 use std::{fs, path::PathBuf, sync::Arc};
 use zed::{
-    self, assets,
+    self,
+    assets::Assets,
     channel::ChannelList,
     chat_panel, editor, file_finder,
     fs::RealFs,
@@ -20,9 +22,15 @@ use zed::{
 fn main() {
     init_logger();
 
-    let app = gpui::App::new(assets::Assets).unwrap();
+    let app = gpui::App::new(Assets).unwrap();
+    let embedded_fonts = Assets
+        .list("fonts")
+        .into_iter()
+        .map(|f| Arc::new(Assets.load(&f).unwrap().to_vec()))
+        .collect();
+    app.platform().fonts().add_fonts(embedded_fonts).unwrap();
 
-    let themes = settings::ThemeRegistry::new(assets::Assets, app.font_cache());
+    let themes = settings::ThemeRegistry::new(Assets, app.font_cache());
     let (settings_tx, settings) = settings::channel(&app.font_cache(), &themes).unwrap();
     let languages = Arc::new(language::LanguageRegistry::new());
     languages.set_theme(&settings.borrow().theme.syntax);

zed/src/settings.rs

@@ -37,8 +37,8 @@ impl Settings {
 
     pub fn new(font_cache: &FontCache, theme: Arc<Theme>) -> Result<Self> {
         Ok(Self {
-            buffer_font_family: font_cache.load_family(&["Fira Code", "Monaco"])?,
-            buffer_font_size: 14.0,
+            buffer_font_family: font_cache.load_family(&["Inconsolata"])?,
+            buffer_font_size: 16.,
             tab_size: 4,
             theme,
         })