diff options
| -rw-r--r-- | book/src/themes.md | 2 | ||||
| -rw-r--r-- | helix-view/src/graphics.rs | 18 | ||||
| -rw-r--r-- | helix-view/src/theme.rs | 3 |
3 files changed, 11 insertions, 12 deletions
diff --git a/book/src/themes.md b/book/src/themes.md index e84f8705..66ad380e 100644 --- a/book/src/themes.md +++ b/book/src/themes.md @@ -16,7 +16,7 @@ Each line in the theme file is specified as below: key = { fg = "#ffffff", bg = "#000000", underline-color = "#ff0000", underline-style = "curl", modifiers = ["bold", "italic"] } ``` -where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline_style` the underline style, `underline_color` the underline color (only meaningful if an underline style is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults. +where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline-style` the underline style, `underline-color` the underline color (only meaningful if an underline style is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults. To specify only the foreground color: diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs index 01344748..4374a537 100644 --- a/helix-view/src/graphics.rs +++ b/helix-view/src/graphics.rs @@ -365,16 +365,16 @@ bitflags! { /// /// let m = Modifier::BOLD | Modifier::ITALIC; /// ``` - #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize), serde(rename_all = "kebab-case"))] + #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct Modifier: u16 { - const BOLD = 0b0000_0000_0000_0001; - const DIM = 0b0000_0000_0000_0010; - const ITALIC = 0b0000_0000_0000_0100; - const SLOW_BLINK = 0b0000_0000_0001_0000; - const RAPID_BLINK = 0b0000_0000_0010_0000; - const REVERSED = 0b0000_0000_0100_0000; - const HIDDEN = 0b0000_0000_1000_0000; - const CROSSED_OUT = 0b0000_0001_0000_0000; + const BOLD = 0b0000_0000_0001; + const DIM = 0b0000_0000_0010; + const ITALIC = 0b0000_0000_0100; + const SLOW_BLINK = 0b0000_0001_0000; + const RAPID_BLINK = 0b0000_0010_0000; + const REVERSED = 0b0000_0100_0000; + const HIDDEN = 0b0000_1000_0000; + const CROSSED_OUT = 0b0001_0000_0000; } } diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs index b1c96f94..c32b3edf 100644 --- a/helix-view/src/theme.rs +++ b/helix-view/src/theme.rs @@ -268,7 +268,7 @@ impl ThemePalette { value .as_str() .and_then(|s| s.parse().ok()) - .ok_or(format!("Theme: invalid underline_style: {}", value)) + .ok_or(format!("Theme: invalid underline-style: {}", value)) } pub fn parse_style(&self, style: &mut Style, value: Value) -> Result<(), String> { @@ -279,7 +279,6 @@ impl ThemePalette { "bg" => *style = style.bg(self.parse_color(value)?), "underline-color" => *style = style.underline_color(self.parse_color(value)?), "underline-style" => { - warn!("found style"); *style = style.underline_style(Self::parse_underline_style(&value)?) } "modifiers" => { |