git.iko.soy/helix
on master help sign in
fix: Merge default palette with user palette
e4e93e1Gokul Soumya
book/src/themes.md+3−1
compare with master
unifiedsplit
@@ -124,7 +124,9 @@ black = "#000000"
124Remember that the `[palette]` table includes all keys after its header,
124Remember that the `[palette]` table includes all keys after its header,
125so you should define the palette after normal theme options.
125so you should define the palette after normal theme options.
126
126
127−If there is no `[palette]` section, a default palette which uses the terminal's default 16 colors are used:
127+The default palette uses the terminal's default 16 colors, and the colors names
128+are listed below. The `[palette]` section in the config file takes precedence
129+over it and is merged into the default palette.
128
130
129| Color Name |
131| Color Name |
130| --- |
132| --- |
helix-view/src/theme.rs+26−19
@@ -143,30 +143,37 @@ struct ThemePalette {
143
143
144impl Default for ThemePalette {
144impl Default for ThemePalette {
145 fn default() -> Self {
145 fn default() -> Self {
146+ Self {
146− Self::new(hashmap! {
147+ palette: hashmap! {
147− "black".to_string() => Color::Black,
148+ "black".to_string() => Color::Black,
148− "red".to_string() => Color::Red,
149+ "red".to_string() => Color::Red,
149− "green".to_string() => Color::Green,
150+ "green".to_string() => Color::Green,
150− "yellow".to_string() => Color::Yellow,
151+ "yellow".to_string() => Color::Yellow,
151− "blue".to_string() => Color::Blue,
152+ "blue".to_string() => Color::Blue,
152− "magenta".to_string() => Color::Magenta,
153+ "magenta".to_string() => Color::Magenta,
153− "cyan".to_string() => Color::Cyan,
154+ "cyan".to_string() => Color::Cyan,
154− "gray".to_string() => Color::Gray,
155+ "gray".to_string() => Color::Gray,
155− "light-red".to_string() => Color::LightRed,
156+ "light-red".to_string() => Color::LightRed,
156− "light-green".to_string() => Color::LightGreen,
157+ "light-green".to_string() => Color::LightGreen,
157− "light-yellow".to_string() => Color::LightYellow,
158+ "light-yellow".to_string() => Color::LightYellow,
158− "light-blue".to_string() => Color::LightBlue,
159+ "light-blue".to_string() => Color::LightBlue,
159− "light-magenta".to_string() => Color::LightMagenta,
160+ "light-magenta".to_string() => Color::LightMagenta,
160− "light-cyan".to_string() => Color::LightCyan,
161+ "light-cyan".to_string() => Color::LightCyan,
161− "light-gray".to_string() => Color::LightGray,
162+ "light-gray".to_string() => Color::LightGray,
162− "white".to_string() => Color::White,
163+ "white".to_string() => Color::White,
164+ },
163− })
165+ }
164 }
166 }
165}
167}
166
168
167impl ThemePalette {
169impl ThemePalette {
168 pub fn new(palette: HashMap<String, Color>) -> Self {
170 pub fn new(palette: HashMap<String, Color>) -> Self {
171+ let ThemePalette {
172+ palette: mut default,
173+ } = ThemePalette::default();
174+
175+ default.extend(palette);
169− Self { palette }
176+ Self { palette: default }
170 }
177 }
171
178
172 pub fn hex_string_to_rgb(s: &str) -> Result<Color, String> {
179 pub fn hex_string_to_rgb(s: &str) -> Result<Color, String> {