Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inherit theme #3067

Merged
merged 8 commits into from
Oct 3, 2022
Merged

Inherit theme #3067

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33daeaf
Add RawTheme to handle inheritance with theme palette
TheSamsa Jul 14, 2022
3370de8
Add a intermediate step in theme loading
TheSamsa Jul 14, 2022
cbbe8ae
Load default themes via RawThemes, remove Theme deserialization
TheSamsa Jul 14, 2022
07f6cf2
Allow naming custom theme same as inherited one
TheSamsa Jul 14, 2022
0ddd6d7
Remove RawTheme and use toml::Value directly
TheSamsa Aug 9, 2022
b5e267d
Resolve all review changes resulting in a cleaner code
TheSamsa Aug 10, 2022
43e7cd4
Simplify return for Loader::load
TheSamsa Sep 6, 2022
0bc852b
Add implementation to avoid extra step for loading of base themes
TheSamsa Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Load default themes via RawThemes, remove Theme deserialization
  • Loading branch information
@TheSamsa
TheSamsa committed Aug 9, 2022
commit cbbe8ae51d2b5fee32c919bb499a8c1909009c84
68 changes: 9 additions & 59 deletions helix-view/src/theme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ use toml::Value;
pub use crate::graphics::{Color, Modifier, Style};

pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
let raw_theme: RawTheme = toml::from_slice(include_bytes!("../../theme.toml"))
.expect("Failed to parse default theme");
Theme::from(raw_theme)
});
pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
toml::from_slice(include_bytes!("../../base16_theme.toml"))
.expect("Failed to parse base 16 default theme")
let raw_theme: RawTheme = toml::from_slice(include_bytes!("../../base16_theme.toml"))
.expect("Failed to parse base 16 default theme");
Theme::from(raw_theme)
});

#[derive(Clone, Debug)]
Expand Down Expand Up @@ -53,11 +56,6 @@ impl Loader {
}

Ok(Theme::from(raw_theme))

// let path = self.path(name);
// let data = std::fs::read(&path)?;

// toml::from_slice(data.as_slice()).context("Faled to deserialize theme")
}

pub fn read_names(path: &Path) -> Vec<String> {
Expand Down Expand Up @@ -88,13 +86,11 @@ impl Loader {
let filename = format!("{}.toml", name);

let user_path = self.user_dir.join(&filename);
let path = if user_path.exists() {
if user_path.exists() {
user_path
} else {
self.default_dir.join(filename)
};

path
}
}

/// Lists all theme names available in default and user directory
Expand Down Expand Up @@ -171,7 +167,7 @@ impl<'de> Deserialize<'de> for RawTheme {

let inherits_from = values
.remove("inherits_from")
.map(|value| value.to_string().replace("\"", ""));
.map(|value| value.to_string().replace('\"', ""));

Ok(Self {
values,
Expand Down Expand Up @@ -216,52 +212,6 @@ impl From<RawTheme> for Theme {
}
}

impl<'de> Deserialize<'de> for Theme {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let mut styles = HashMap::new();
let mut scopes = Vec::new();
let mut highlights = Vec::new();

if let Ok(mut colors) = HashMap::<String, Value>::deserialize(deserializer) {
// TODO: alert user of parsing failures in editor
let palette = colors
.remove("palette")
.map(|value| {
ThemePalette::try_from(value).unwrap_or_else(|err| {
warn!("{}", err);
ThemePalette::default()
})
})
.unwrap_or_default();

styles.reserve(colors.len());
scopes.reserve(colors.len());
highlights.reserve(colors.len());

for (name, style_value) in colors {
let mut style = Style::default();
if let Err(err) = palette.parse_style(&mut style, style_value) {
warn!("{}", err);
}

// these are used both as UI and as highlights
styles.insert(name.clone(), style);
scopes.push(name);
highlights.push(style);
}
}

Ok(Self {
scopes,
styles,
highlights,
})
}
}

impl Theme {
#[inline]
pub fn highlight(&self, index: usize) -> Style {
Expand Down