mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Gracefully handle errors when loading themes (#6904)

Browse source 
This PR improves the theme loading to gracefully handle when a theme
couldn't be loaded.

Trying to debug a panic that happens on startup in Nightly.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-01-27 19:37:01 -05:00 committed by GitHub
parent dfad36f668
commit 5b9cc26194
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/theme/src/registry.rs
View file

@ -1,9 +1,10 @@
use std::collections::HashMap;
use std::sync::Arc;
use anyhow::{anyhow, Result};
use anyhow::{anyhow, Context, Result};
use gpui::{AssetSource, HighlightStyle, SharedString};
use refineable::Refineable;
use util::ResultExt;
use crate::{
try_parse_color, Appearance, AppearanceContent, PlayerColor, PlayerColors, StatusColors,
@ -178,17 +179,21 @@ impl ThemeRegistry {
let theme_paths = self
.assets
.list("themes/")
.unwrap()
.expect("failed to list theme assets")
.into_iter()
.filter(|path| path.ends_with(".json"));
for path in theme_paths {
let theme = self
.assets
.load(&path)
.expect(&format!("Failed to load theme '{path}'"));
let Some(theme) = self.assets.load(&path).log_err() else {
continue;
};
let theme_family: ThemeFamilyContent = serde_json::from_slice(&theme).unwrap();
let Some(theme_family) = serde_json::from_slice(&theme)
.with_context(|| format!("failed to parse theme at path \"{path}\""))
.log_err()
else {
continue;
};
self.insert_user_theme_families([theme_family]);
}