rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-07-11 14:30:24 +02:00
Code Issues Releases Activity

Add italic to style attributes

Browse Source
This commit is contained in:
Tor Shepherd
2024-06-21 15:11:25 -04:00
parent c9ebcbd8ab
commit 2ebea63de3
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FAQ.md
View File

@ -248,7 +248,7 @@ The `--colors` flag is a bit more complicated. The general format is:
to bold the output or not). to bold the output or not).
* `{value}` is determined by the value of `{attribute}`. If * `{value}` is determined by the value of `{attribute}`. If
`{attribute}` is `style`, then `{value}` should be one of `nobold`, `{attribute}` is `style`, then `{value}` should be one of `nobold`,
`bold`, `nointense`, `intense`, `nounderline` or `underline`. If `bold`, `nointense`, `intense`, `nounderline`, `underline`, `noitalic`, or `italic`. If
`{attribute}` is `fg` or `bg`, then `{value}` should be a color. `{attribute}` is `fg` or `bg`, then `{value}` should be a color.
A color is specified by either one of eight of English names, a single 256-bit A color is specified by either one of eight of English names, a single 256-bit

2
crates/core/flags/defs.rs
View File

@ -835,7 +835,7 @@ provided multiple times. Settings are applied iteratively. Pre-existing color
labels are limited to one of eight choices: \fBred\fP, \fBblue\fP, \fBgreen\fP, labels are limited to one of eight choices: \fBred\fP, \fBblue\fP, \fBgreen\fP,
\fBcyan\fP, \fBmagenta\fP, \fByellow\fP, \fBwhite\fP and \fBblack\fP. Styles \fBcyan\fP, \fBmagenta\fP, \fByellow\fP, \fBwhite\fP and \fBblack\fP. Styles
are limited to \fBnobold\fP, \fBbold\fP, \fBnointense\fP, \fBintense\fP, are limited to \fBnobold\fP, \fBbold\fP, \fBnointense\fP, \fBintense\fP,
\fBnounderline\fP or \fBunderline\fP. \fBnounderline\fP, \fBunderline\fP, \fBnoitalic\fP, or \fBitalic\fP, .
.sp .sp
The format of the flag is The format of the flag is
\fB{\fP\fItype\fP\fB}:{\fP\fIattribute\fP\fB}:{\fP\fIvalue\fP\fB}\fP. \fB{\fP\fItype\fP\fB}:{\fP\fIattribute\fP\fB}:{\fP\fIvalue\fP\fB}\fP.

14
crates/printer/src/color.rs
View File

@ -65,7 +65,7 @@ impl std::fmt::Display for ColorError {
f, f,
"unrecognized style attribute '{}'. Choose from: \ "unrecognized style attribute '{}'. Choose from: \
nobold, bold, nointense, intense, nounderline, \ nobold, bold, nointense, intense, nounderline, \
underline.", underline, noitalic, italic.",
name, name,
), ),
ColorError::InvalidFormat(ref original) => write!( ColorError::InvalidFormat(ref original) => write!(
@ -121,7 +121,7 @@ pub struct ColorSpecs {
/// `0x`. /// `0x`.
/// ///
/// Valid style instructions are `nobold`, `bold`, `intense`, `nointense`, /// Valid style instructions are `nobold`, `bold`, `intense`, `nointense`,
/// `underline`, `nounderline`. /// `underline`, `nounderline`, `italic`, `noitalic`.
/// ///
/// ## Example /// ## Example
/// ///
@ -201,6 +201,8 @@ enum Style {
NoIntense, NoIntense,
Underline, Underline,
NoUnderline, NoUnderline,
Italic,
NoItalic,
} }
impl ColorSpecs { impl ColorSpecs {
@ -286,6 +288,12 @@ impl SpecValue {
Style::NoUnderline => { Style::NoUnderline => {
cspec.set_underline(false); cspec.set_underline(false);
} }
Style::Italic => {
cspec.set_italic(true);
}
Style::NoItalic => {
cspec.set_italic(false);
}
}, },
} }
} }
@ -370,6 +378,8 @@ impl std::str::FromStr for Style {
"nointense" => Ok(Style::NoIntense), "nointense" => Ok(Style::NoIntense),
"underline" => Ok(Style::Underline), "underline" => Ok(Style::Underline),
"nounderline" => Ok(Style::NoUnderline), "nounderline" => Ok(Style::NoUnderline),
"italic" => Ok(Style::Italic),
"noitalic" => Ok(Style::NoItalic),
_ => Err(ColorError::UnrecognizedStyle(s.to_string())), _ => Err(ColorError::UnrecognizedStyle(s.to_string())),
} }
} }

2
tests/regression.rs
View File

@ -404,7 +404,7 @@ rgtest!(r428_unrecognized_style, |dir: Dir, mut cmd: TestCommand| {
let expected = "\ let expected = "\
rg: error parsing flag --colors: \ rg: error parsing flag --colors: \
unrecognized style attribute ''. Choose from: nobold, bold, nointense, \ unrecognized style attribute ''. Choose from: nobold, bold, nointense, \
intense, nounderline, underline. intense, nounderline, underline, noitalic, italic.
"; ";
eqnice!(expected, stderr); eqnice!(expected, stderr);
}); });