Skip to content

anstyle-git: RGB colors with 3 hex digits should scale colors #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epage merged 2 commits into from
Jun 26, 2026
+27 −22
Merged

anstyle-git: RGB colors with 3 hex digits should scale colors #331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
925d316
refactor: anstyle-git: Extract `parse_hex_color` as a helper function
joshtriplett Jun 26, 2026
cdb527a
fix: anstyle-git: RGB colors with 3 hex digits should scale colors
joshtriplett Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 27 additions & 22 deletions crates/anstyle-git/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,7 @@ fn parse_color(word: &str) -> Result<Option<anstyle::Color>, ()> {
"white" => Some(anstyle::AnsiColor::White.into()),
_ => {
if let Some(hex) = word.strip_prefix('#') {
let l = hex.len();
if l != 3 && l != 6 {
return Err(());
}
let l = l / 3;
if let (Ok(r), Ok(g), Ok(b)) = (
u8::from_str_radix(&hex[0..l], 16),
u8::from_str_radix(&hex[l..(2 * l)], 16),
u8::from_str_radix(&hex[(2 * l)..(3 * l)], 16),
) {
Some(anstyle::Color::from((r, g, b)))
} else {
return Err(());
}
Some(parse_hex_color(hex)?)
} else if let Ok(n) = word.parse::<u8>() {
Some(anstyle::Color::from(n))
} else {
Expand All @@ -135,6 +122,24 @@ fn parse_color(word: &str) -> Result<Option<anstyle::Color>, ()> {
Ok(color)
}

fn parse_hex_color(hex: &str) -> Result<anstyle::Color, ()> {
let l = hex.len();
if l != 3 && l != 6 {
return Err(());
}
let l = l / 3;
if let (Ok(r), Ok(g), Ok(b)) = (
u8::from_str_radix(&hex[0..l], 16),
u8::from_str_radix(&hex[l..(2 * l)], 16),
u8::from_str_radix(&hex[(2 * l)..(3 * l)], 16),
) {
let m = if l == 1 { 0x11 } else { 1 };
Ok(anstyle::Color::from((r * m, g * m, b * m)))
} else {
Err(())
}
}

/// Type for errors returned by the parser.
#[derive(Debug, PartialEq, Eq)]
#[non_exhaustive]
Expand Down Expand Up @@ -217,12 +222,12 @@ mod tests {
test!("#204060" => RgbColor(0x20,0x40,0x60).on_default());
test!("#1a2b3c" => RgbColor(0x1a,0x2b,0x3c).on_default());
test!("#000" => RgbColor(0,0,0).on_default());
test!("#cba" => RgbColor(0xc,0xb,0xa).on_default());
test!("#cba " => RgbColor(0xc,0xb,0xa).on_default());
test!("#987 #135" => RgbColor(9,8,7).on(RgbColor(1, 3, 5)));
test!("#987 #135 " => RgbColor(9,8,7).on(RgbColor(1, 3, 5)));
test!("#123 #abcdef" => RgbColor(1,2,3).on(RgbColor(0xab, 0xcd, 0xef)));
test!("#654321 #a9b" => RgbColor(0x65,0x43,0x21).on(RgbColor(0xa, 0x9, 0xb)));
test!("#cba" => RgbColor(0xcc, 0xbb, 0xaa).on_default());
test!("#cba " => RgbColor(0xcc, 0xbb, 0xaa).on_default());
test!("#987 #135" => RgbColor(0x99, 0x88, 0x77).on(RgbColor(0x11, 0x33, 0x55)));
test!("#987 #135 " => RgbColor(0x99, 0x88, 0x77).on(RgbColor(0x11, 0x33, 0x55)));
test!("#123 #abcdef" => RgbColor(0x11, 0x22, 0x33).on(RgbColor(0xab, 0xcd, 0xef)));
test!("#654321 #a9b" => RgbColor(0x65, 0x43, 0x21).on(RgbColor(0xaa, 0x99, 0xbb)));

test!("bold cyan white" => Cyan.on(White).bold());
test!("bold cyan nobold white" => Cyan.on(White));
Expand All @@ -232,8 +237,8 @@ mod tests {
test!("italic cyan white" => Cyan.on(White).italic());
test!("strike cyan white" => Cyan.on(White).strikethrough());
test!("blink #050505 white" => RgbColor(5,5,5).on(White).blink());
test!("bold #987 green" => RgbColor(9,8,7).on(Green).bold());
test!("strike #147 #cba" => RgbColor(1,4,7).on(RgbColor(0xc, 0xb, 0xa)).strikethrough());
test!("bold #987 green" => RgbColor(0x99, 0x88, 0x77).on(Green).bold());
test!("strike #147 #cba" => RgbColor(0x11, 0x44, 0x77).on(RgbColor(0xcc, 0xbb, 0xaa)).strikethrough());
}

#[test]
Expand Down
Loading