MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-03-14 06:38:24 +00:00
Code Issues Releases Wiki Activity

HighlightingAssets: Encapsulate theme_set behind a getter

Browse Source 
Mainly to prepare for potential lazy-loading in the future to
improve startup performance. Like we did for syntax_set.
This commit is contained in:
Martin Nordholts 2021-07-29 12:47:26 +02:00
parent f3d53b79a2
commit ffdf349a96
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/assets.rs
View File

@ -21,7 +21,7 @@ use crate::syntax_mapping::{MappingTarget, SyntaxMapping};
pub struct HighlightingAssets { pub struct HighlightingAssets {
syntax_set_cell: LazyCell<SyntaxSet>, syntax_set_cell: LazyCell<SyntaxSet>,
serialized_syntax_set: Option<SerializedSyntaxSet>, serialized_syntax_set: Option<SerializedSyntaxSet>,
pub(crate) theme_set: ThemeSet, theme_set: ThemeSet,
fallback_theme: Option<&'static str>, fallback_theme: Option<&'static str>,
} }
@ -140,7 +140,11 @@ impl HighlightingAssets {
pub fn save_to_cache(&self, target_dir: &Path, current_version: &str) -> Result<()> { pub fn save_to_cache(&self, target_dir: &Path, current_version: &str) -> Result<()> {
let _ = fs::create_dir_all(target_dir); let _ = fs::create_dir_all(target_dir);
asset_to_cache(&self.theme_set, &target_dir.join("themes.bin"), "theme set")?; asset_to_cache(
self.get_theme_set(),
&target_dir.join("themes.bin"),
"theme set",
)?;
asset_to_cache( asset_to_cache(
self.get_syntax_set()?, self.get_syntax_set()?,
&target_dir.join("syntaxes.bin"), &target_dir.join("syntaxes.bin"),
@ -187,8 +191,12 @@ impl HighlightingAssets {
Ok(self.get_syntax_set()?.syntaxes()) Ok(self.get_syntax_set()?.syntaxes())
} }
fn get_theme_set(&self) -> &ThemeSet {
&self.theme_set
}
pub fn themes(&self) -> impl Iterator<Item = &str> { pub fn themes(&self) -> impl Iterator<Item = &str> {
self.theme_set.themes.keys().map(|s| s.as_ref()) self.get_theme_set().themes.keys().map(|s| s.as_ref())
} }
/// Use [Self::get_syntax_for_file_name] instead /// Use [Self::get_syntax_for_file_name] instead
@ -219,7 +227,7 @@ impl HighlightingAssets {
} }
pub(crate) fn get_theme(&self, theme: &str) -> &Theme { pub(crate) fn get_theme(&self, theme: &str) -> &Theme {
match self.theme_set.themes.get(theme) { match self.get_theme_set().themes.get(theme) {
Some(theme) => theme, Some(theme) => theme,
None => { None => {
if theme == "ansi-light" || theme == "ansi-dark" { if theme == "ansi-light" || theme == "ansi-dark" {
@ -229,7 +237,8 @@ impl HighlightingAssets {
if !theme.is_empty() { if !theme.is_empty() {
bat_warning!("Unknown theme '{}', using default.", theme) bat_warning!("Unknown theme '{}', using default.", theme)
} }
&self.theme_set.themes[self.fallback_theme.unwrap_or_else(|| Self::default_theme())] &self.get_theme_set().themes
[self.fallback_theme.unwrap_or_else(|| Self::default_theme())]
} }
} }
} }