Kirill Bulatov
16366cf9f2
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
68 lines
2.1 KiB
Rust
68 lines
2.1 KiB
Rust
// This crate was essentially pulled out verbatim from main `zed` crate to avoid having to run RustEmbed macro whenever zed has to be rebuilt. It saves a second or two on an incremental build.
|
|
|
|
use anyhow::Context as _;
|
|
use gpui::{App, AssetSource, Result, SharedString};
|
|
use rust_embed::RustEmbed;
|
|
|
|
#[derive(RustEmbed)]
|
|
#[folder = "../../assets"]
|
|
#[include = "fonts/**/*"]
|
|
#[include = "icons/**/*"]
|
|
#[include = "images/**/*"]
|
|
#[include = "themes/**/*"]
|
|
#[exclude = "themes/src/*"]
|
|
#[include = "sounds/**/*"]
|
|
#[include = "prompts/**/*"]
|
|
#[include = "*.md"]
|
|
#[exclude = "*.DS_Store"]
|
|
pub struct Assets;
|
|
|
|
impl AssetSource for Assets {
|
|
fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
|
|
Self::get(path)
|
|
.map(|f| Some(f.data))
|
|
.with_context(|| format!("loading asset at path {path:?}"))
|
|
}
|
|
|
|
fn list(&self, path: &str) -> Result<Vec<SharedString>> {
|
|
Ok(Self::iter()
|
|
.filter_map(|p| {
|
|
if p.starts_with(path) {
|
|
Some(p.into())
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
.collect())
|
|
}
|
|
}
|
|
|
|
impl Assets {
|
|
/// Populate the [`TextSystem`] of the given [`AppContext`] with all `.ttf` fonts in the `fonts` directory.
|
|
pub fn load_fonts(&self, cx: &App) -> anyhow::Result<()> {
|
|
let font_paths = self.list("fonts")?;
|
|
let mut embedded_fonts = Vec::new();
|
|
for font_path in font_paths {
|
|
if font_path.ends_with(".ttf") {
|
|
let font_bytes = cx
|
|
.asset_source()
|
|
.load(&font_path)?
|
|
.expect("Assets should never return None");
|
|
embedded_fonts.push(font_bytes);
|
|
}
|
|
}
|
|
|
|
cx.text_system().add_fonts(embedded_fonts)
|
|
}
|
|
|
|
pub fn load_test_fonts(&self, cx: &App) {
|
|
cx.text_system()
|
|
.add_fonts(vec![
|
|
self.load("fonts/plex-mono/ZedPlexMono-Regular.ttf")
|
|
.unwrap()
|
|
.unwrap(),
|
|
])
|
|
.unwrap()
|
|
}
|
|
}
|