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

adress review comments

pull/4061/head
Pascal Kuthe 2022-10-11 12:11:33 +02:00
parent 2f7088c1f3
commit 328c4d002f
No known key found for this signature in database
GPG Key ID: D715E8655AE166A6
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
book/src/themes.md
View File

@ -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"] } 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: To specify only the foreground color:

18
helix-view/src/graphics.rs
View File

@ -365,16 +365,16 @@ bitflags! {
/// ///
/// let m = Modifier::BOLD | Modifier::ITALIC; /// 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 { pub struct Modifier: u16 {
const BOLD = 0b0000_0000_0000_0001; const BOLD = 0b0000_0000_0001;
const DIM = 0b0000_0000_0000_0010; const DIM = 0b0000_0000_0010;
const ITALIC = 0b0000_0000_0000_0100; const ITALIC = 0b0000_0000_0100;
const SLOW_BLINK = 0b0000_0000_0001_0000; const SLOW_BLINK = 0b0000_0001_0000;
const RAPID_BLINK = 0b0000_0000_0010_0000; const RAPID_BLINK = 0b0000_0010_0000;
const REVERSED = 0b0000_0000_0100_0000; const REVERSED = 0b0000_0100_0000;
const HIDDEN = 0b0000_0000_1000_0000; const HIDDEN = 0b0000_1000_0000;
const CROSSED_OUT = 0b0000_0001_0000_0000; const CROSSED_OUT = 0b0001_0000_0000;
} }
} }

3
helix-view/src/theme.rs
View File

@ -268,7 +268,7 @@ impl ThemePalette {
value value
.as_str() .as_str()
.and_then(|s| s.parse().ok()) .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> { 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)?), "bg" => *style = style.bg(self.parse_color(value)?),
"underline-color" => *style = style.underline_color(self.parse_color(value)?), "underline-color" => *style = style.underline_color(self.parse_color(value)?),
"underline-style" => { "underline-style" => {
warn!("found style");
*style = style.underline_style(Self::parse_underline_style(&value)?) *style = style.underline_style(Self::parse_underline_style(&value)?)
} }
"modifiers" => { "modifiers" => {