DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Merge pull request #248 from Bytekeeper/develop

Browse source 
Fix to allow stripping of 0-prefixed color codes
This commit is contained in:
Aaron Weiss 2023-03-28 13:15:48 -07:00 committed by GitHub
commit d40e3ce844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
irc-proto/src/colors.rs
View file

@ -69,8 +69,13 @@ impl Parser {
self.state = Foreground1(cur); self.state = Foreground1(cur);
false false
} }
Foreground1('0') if cur.is_digit(10) => {
// can consume another digit if previous char was 0.
self.state = Foreground2;
false
}
Foreground1('1') if cur.is_digit(6) => { Foreground1('1') if cur.is_digit(6) => {
// can only consume another digit if previous char was 1. // can consume another digit if previous char was 1.
self.state = Foreground2; self.state = Foreground2;
false false
} }
@ -97,7 +102,7 @@ impl Parser {
} }
_ => { _ => {
self.state = Text; self.state = Text;
true !FORMAT_CHARACTERS.contains(&cur)
} }
} }
} }
@ -161,10 +166,14 @@ mod test {
bold_hangul("우왕\x02굳", should stripped into "우왕굳"), bold_hangul("우왕\x02굳", should stripped into "우왕굳"),
fg_color("l\x033ol", should stripped into "lol"), fg_color("l\x033ol", should stripped into "lol"),
fg_color2("l\x0312ol", should stripped into "lol"), fg_color2("l\x0312ol", should stripped into "lol"),
fg_color3("l\x0302ol", should stripped into "lol"),
fg_color4("l\x030ol", should stripped into "lol"),
fg_color5("l\x0309ol", should stripped into "lol"),
fg_bg_11("l\x031,2ol", should stripped into "lol"), fg_bg_11("l\x031,2ol", should stripped into "lol"),
fg_bg_21("l\x0312,3ol", should stripped into "lol"), fg_bg_21("l\x0312,3ol", should stripped into "lol"),
fg_bg_12("l\x031,12ol", should stripped into "lol"), fg_bg_12("l\x031,12ol", should stripped into "lol"),
fg_bg_22("l\x0312,13ol", should stripped into "lol"), fg_bg_22("l\x0312,13ol", should stripped into "lol"),
fg_bold("l\x0309\x02ol", should stripped into "lol"),
string_with_multiple_colors("hoo\x034r\x033a\x0312y", should stripped into "hooray"), string_with_multiple_colors("hoo\x034r\x033a\x0312y", should stripped into "hooray"),
string_with_digit_after_color("\x0344\x0355\x0366", should stripped into "456"), string_with_digit_after_color("\x0344\x0355\x0366", should stripped into "456"),
string_with_multiple_2digit_colors("hoo\x0310r\x0311a\x0312y", should stripped into "hooray"), string_with_multiple_2digit_colors("hoo\x0310r\x0311a\x0312y", should stripped into "hooray"),