Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect categorization of SGR sequences 

Specifically, prevent other attributes from leaking into the
bold/dim/italic/underline attributes, and ensure that bright backgrounds
are put into the background attribute instead of the foreground
attribute.
This commit is contained in:
Ethan P. 2024-02-11 19:27:04 -08:00
parent 5a2a20af42
commit 915dd9fbf8
No known key found for this signature in database
GPG Key ID: 1BA2A0CC7C22B854
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
- Fix long file name wrapping in header, see #2835 (@FilipRazek) - Fix long file name wrapping in header, see #2835 (@FilipRazek)
- Fix `NO_COLOR` support, see #2767 (@acuteenvy) - Fix `NO_COLOR` support, see #2767 (@acuteenvy)
- Fix handling of inputs with OSC ANSI escape sequences, see #2541 and #2544 (@eth-p) - Fix handling of inputs with OSC ANSI escape sequences, see #2541 and #2544 (@eth-p)
- Fix handling of inputs with combined ANSI color and attribute sequences, see #2185 and #2856 (@eth-p)
## Other ## Other

10
src/vscreen.rs
View File

@ -169,10 +169,10 @@ impl Attributes {
while let Some(p) = iter.next() { while let Some(p) = iter.next() {
match p { match p {
0 => self.sgr_reset(), 0 => self.sgr_reset(),
1 => self.bold = format!("\x1B[{}m", parameters), 1 => self.bold = "\x1B[1m".to_owned(),
2 => self.dim = format!("\x1B[{}m", parameters), 2 => self.dim = "\x1B[2m".to_owned(),
3 => self.italic = format!("\x1B[{}m", parameters), 3 => self.italic = "\x1B[3m".to_owned(),
4 => self.underline = format!("\x1B[{}m", parameters), 4 => self.underline = "\x1B[4m".to_owned(),
23 => self.italic.clear(), 23 => self.italic.clear(),
24 => self.underline.clear(), 24 => self.underline.clear(),
22 => { 22 => {
@ -183,7 +183,7 @@ impl Attributes {
40..=49 => self.background = Self::parse_color(p, &mut iter), 40..=49 => self.background = Self::parse_color(p, &mut iter),
58..=59 => self.underlined = Self::parse_color(p, &mut iter), 58..=59 => self.underlined = Self::parse_color(p, &mut iter),
90..=97 => self.foreground = Self::parse_color(p, &mut iter), 90..=97 => self.foreground = Self::parse_color(p, &mut iter),
100..=107 => self.foreground = Self::parse_color(p, &mut iter), 100..=107 => self.background = Self::parse_color(p, &mut iter),
_ => { _ => {
// Unsupported SGR sequence. // Unsupported SGR sequence.
// Be compatible and pretend one just wasn't was provided. // Be compatible and pretend one just wasn't was provided.