@@ -14,15 +14,23 @@ use toml::{map::Map, Value};
1414use crate::graphics::UnderlineStyle;
1515pub use crate::graphics::{Color, Modifier, Style};
1616
17+pub static DEFAULT_THEME_DATA: Lazy<Value> = Lazy::new(|| {
18+ toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
19+});
20+
21+pub static BASE16_DEFAULT_THEME_DATA: Lazy<Value> = Lazy::new(|| {
22+ toml::from_slice(include_bytes!("../../base16_theme.toml"))
23+ .expect("Failed to parse base 16 default theme")
24+});
25+
1726pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| Theme {
1827 name: "default".into(),
19− ..toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
28+ ..Theme::from(DEFAULT_THEME_DATA.clone())
2029});
2130
2231pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| Theme {
23− name: "base16_theme".into(),
24− ..toml::from_slice(include_bytes!("../../base16_theme.toml"))
25− .expect("Failed to parse base 16 default theme")
32+ name: "base16_default".into(),
33+ ..Theme::from(BASE16_DEFAULT_THEME_DATA.clone())
2634});
2735
2836#[derive(Clone, Debug)]
@@ -78,11 +86,16 @@ impl Loader {
7886 )
7987 })?;
8088
81− let parent_theme_toml = self.load_theme(
82− parent_theme_name,
83− base_them_name,
84− base_them_name == parent_theme_name,
85− )?;
89+ let parent_theme_toml = match parent_theme_name {
90+ // load default themes's toml from const.
91+ "default" => DEFAULT_THEME_DATA.clone(),
92+ "base16_default" => BASE16_DEFAULT_THEME_DATA.clone(),
93+ _ => self.load_theme(
94+ parent_theme_name,
95+ base_them_name,
96+ base_them_name == parent_theme_name,
97+ )?,
98+ };
8699
87100 self.merge_themes(parent_theme_toml, theme_toml)
88101 } else {