Mirrors
/
helix
mirror of https://github.com/helix-editor/helix
1
1
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Load theme from toml file.

Browse Source
pull/11/head
Blaž Hrastnik 4 years ago
parent e3c4edae32
commit a65395d94b
5 changed files with 129 additions and 56 deletions
Show Stats Download Patch File Download Diff File

2
Cargo.lock generated
Unescape Escape View File

@ -565,8 +565,10 @@ dependencies = [
"helix-core", "helix-core",
"helix-lsp", "helix-lsp",
"once_cell", "once_cell",
"serde",
"slotmap", "slotmap",
"smol", "smol",
"toml",
"tui", "tui",
"url", "url",
] ]

3
helix-view/Cargo.toml
Unescape Escape View File

@ -26,3 +26,6 @@ smol = "1"
futures-util = "0.3" futures-util = "0.3"
slotmap = "1" slotmap = "1"
serde = { version = "1.0", features = ["derive"] }
toml = "0.5"

5
helix-view/src/editor.rs
Unescape Escape View File

@ -24,7 +24,10 @@ pub enum Action {
impl Editor { impl Editor {
pub fn new(executor: &'static smol::Executor<'static>, mut area: tui::layout::Rect) -> Self { pub fn new(executor: &'static smol::Executor<'static>, mut area: tui::layout::Rect) -> Self {
let theme = Theme::default(); // TODO: load from config dir
let toml = include_str!("../../theme.toml");
let theme: Theme = toml::from_str(&toml).expect("failed to parse theme.toml");
let language_servers = helix_lsp::Registry::new(); let language_servers = helix_lsp::Registry::new();
// HAXX: offset the render area height by 1 to account for prompt/commandline // HAXX: offset the render area height by 1 to account for prompt/commandline

131
helix-view/src/theme.rs
Unescape Escape View File

@ -1,6 +1,8 @@
use helix_core::hashmap;
use std::collections::HashMap; use std::collections::HashMap;
use serde::{Deserialize, Deserializer};
use toml::Value;
#[cfg(feature = "term")] #[cfg(feature = "term")]
pub use tui::style::{Color, Style}; pub use tui::style::{Color, Style};
@ -83,69 +85,88 @@ pub use tui::style::{Color, Style};
// } // }
/// Color theme for syntax highlighting. /// Color theme for syntax highlighting.
#[derive(Debug)]
pub struct Theme { pub struct Theme {
scopes: Vec<String>, scopes: Vec<String>,
mapping: HashMap<&'static str, Style>, styles: HashMap<String, Style>,
} }
impl Default for Theme { impl<'de> Deserialize<'de> for Theme {
fn default() -> Self { fn deserialize<D>(deserializer: D) -> Result<Theme, D::Error>
let mapping = hashmap! { where
"attribute" => Style::default().fg(Color::Rgb(219, 191, 239)), // lilac D: Deserializer<'de>,
"keyword" => Style::default().fg(Color::Rgb(236, 205, 186)), // almond {
"punctuation" => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender let mut styles = HashMap::new();
"punctuation.delimiter" => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender
"operator" => Style::default().fg(Color::Rgb(219, 191, 239)), // lilac if let Ok(colors) = HashMap::<String, Value>::deserialize(deserializer) {
"property" => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender // scopes.reserve(colors.len());
"variable.parameter" => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender styles.reserve(colors.len());
// TODO distinguish type from type.builtin? for (name, style_value) in colors {
"type" => Style::default().fg(Color::Rgb(255, 255, 255)), // white let mut style = Style::default();
"type.builtin" => Style::default().fg(Color::Rgb(255, 255, 255)), // white parse_style(&mut style, style_value);
"constructor" => Style::default().fg(Color::Rgb(219, 191, 239)), // lilac // scopes.push(name);
"function" => Style::default().fg(Color::Rgb(255, 255, 255)), // white styles.insert(name, style);
"function.macro" => Style::default().fg(Color::Rgb(219, 191, 239)), // lilac }
"comment" => Style::default().fg(Color::Rgb(105, 124, 129)), // sirocco }
"variable.builtin" => Style::default().fg(Color::Rgb(159, 242, 143)), // mint
"constant" => Style::default().fg(Color::Rgb(255, 255, 255)), // white let scopes = styles.keys().map(ToString::to_string).collect();
"constant.builtin" => Style::default().fg(Color::Rgb(255, 255, 255)), // white Ok(Theme { scopes, styles })
"string" => Style::default().fg(Color::Rgb(204, 204, 204)), // silver }
"escape" => Style::default().fg(Color::Rgb(239, 186, 93)), // honey }
// used for lifetimes
"label" => Style::default().fg(Color::Rgb(239, 186, 93)), // honey fn parse_style(style: &mut Style, value: Value) {
if let Value::Table(entries) = value {
// TODO: diferentiate number builtin for (name, value) in entries {
// TODO: diferentiate doc comment match name.as_str() {
// TODO: variable as lilac "fg" => {
// TODO: mod/use statements as white if let Some(color) = parse_color(value) {
// TODO: mod stuff as chamoise *style = style.fg(color);
// TODO: add "(scoped_identifier) @path" for std::mem:: }
// }
// concat (ERROR) @syntax-error and "MISSING ;" selectors for errors "bg" => {
if let Some(color) = parse_color(value) {
"module" => Style::default().fg(Color::Rgb(255, 0, 0)), // white *style = style.bg(color);
"variable" => Style::default().fg(Color::Rgb(255, 0, 0)), // white }
"function.builtin" => Style::default().fg(Color::Rgb(255, 0, 0)), // white }
_ => (),
"ui.background" => Style::default().bg(Color::Rgb(59, 34, 76)), // midnight }
"ui.linenr" => Style::default().fg(Color::Rgb(90, 89, 119)), // comet }
"ui.statusline" => Style::default().bg(Color::Rgb(40, 23, 51)), // revolver } else if let Some(color) = parse_color(value) {
"ui.popup" => Style::default().bg(Color::Rgb(40, 23, 51)), // revolver *style = style.fg(color);
}
"warning" => Style::default().fg(Color::Rgb(255, 205, 28)), }
"error" => Style::default().fg(Color::Rgb(244, 120, 104)),
"info" => Style::default().fg(Color::Rgb(111, 68, 240)), fn hex_string_to_rgb(s: &str) -> Option<(u8, u8, u8)> {
"hint" => Style::default().fg(Color::Rgb(204, 204, 204)), if s.starts_with("#") && s.len() >= 7 {
}; if let (Ok(red), Ok(green), Ok(blue)) = (
u8::from_str_radix(&s[1..3], 16),
let scopes = mapping.keys().map(ToString::to_string).collect(); u8::from_str_radix(&s[3..5], 16),
u8::from_str_radix(&s[5..7], 16),
Self { scopes, mapping } ) {
Some((red, green, blue))
} else {
None
}
} else {
None
}
}
fn parse_color(value: Value) -> Option<Color> {
if let Value::String(s) = value {
if let Some((red, green, blue)) = hex_string_to_rgb(&s) {
Some(Color::Rgb(red, green, blue))
} else {
None
}
} else {
None
} }
} }
impl Theme { impl Theme {
pub fn get(&self, scope: &str) -> Style { pub fn get(&self, scope: &str) -> Style {
self.mapping self.styles
.get(scope) .get(scope)
.copied() .copied()
.unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255))) .unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255)))

44
theme.toml
Unescape Escape View File

@ -0,0 +1,44 @@
"attribute" = "#dbbfef" # lilac
"keyword" = "#eccdba" # almond
"punctuation" = "#a4a0e8" # lavender
"punctuation.delimiter" = "#a4a0e8" # lavender
"operator" = "#dbbfef" # lilac
"property" = "#a4a0e8" # lavender
"variable.parameter" = "#a4a0e8" # lavender
# TODO distinguish type from type.builtin?
"type" = "#ffffff" # white
"type.builtin" = "#ffffff" # white
"constructor" = "#dbbfef" # lilac
"function" = "#ffffff" # white
"function.macro" = "#dbbfef" # lilac
"comment" = "#697C81" # sirocco
"variable.builtin" = "#9ff28f" # mint
"constant" = "#ffffff" # white
"constant.builtin" = "#ffffff" # white
"string" = "#cccccc" # silver
"escape" = "#efba5d" # honey
# used for lifetimes
"label" = "#efba5d" # honey
# TODO: diferentiate number builtin
# TODO: diferentiate doc comment
# TODO: variable as lilac
# TODO: mod/use statements as white
# TODO: mod stuff as chamoise
# TODO: add "(scoped_identifier) @path" for std::mem::
#
# concat (ERROR) @syntax-error and "MISSING ;" selectors for errors
"module" = "#ff0000"
"variable" = "#ff0000"
"function.builtin" = "#ff0000"
"ui.background" = { bg = "#3b224c" } # midnight
"ui.linenr" = { fg = "#5a5977" } # comet
"ui.statusline" = { bg = "#281733" } # revolver
"ui.popup" = { bg = "#281733" } # revolver
"warning" = "#ffcd1c"
"error" = "#f47868"
"info" = "#6F44F0"
"hint" = "#cccccc"
Write Preview
Loading…
Cancel
Save