fix(style): bring the nice match back (#92)
* It 'aint much, but it's honest work (else-if ladder -> match) * Maybe this is nicer? * fix(style): use nicer structure for nicer matches * style(code): match ordering Co-authored-by: Brooks J Rady <b.j.rady@gmail.com>
This commit is contained in:
Aram Drevekenin
GitHub
parent
a933b8320b
commit
d950bab5ab
1 changed files with 84 additions and 123 deletions
|
|
@ -302,131 +302,92 @@ impl CharacterStyles {
|
||||||
}
|
}
|
||||||
pub fn add_style_from_ansi_params(&mut self, ansi_params: &[i64]) {
|
pub fn add_style_from_ansi_params(&mut self, ansi_params: &[i64]) {
|
||||||
let mut params_used = 1; // if there's a parameter, it is always used
|
let mut params_used = 1; // if there's a parameter, it is always used
|
||||||
if ansi_params.is_empty() || ansi_params[0] == 0 {
|
match ansi_params {
|
||||||
self.reset_all();
|
[] | [0, ..] => self.reset_all(),
|
||||||
} else if ansi_params[0] == 39 {
|
[1, ..] => *self = self.bold(Some(AnsiCode::On)),
|
||||||
*self = self.foreground(Some(AnsiCode::Reset));
|
[2, ..] => *self = self.dim(Some(AnsiCode::On)),
|
||||||
} else if ansi_params[0] == 49 {
|
[3, ..] => *self = self.italic(Some(AnsiCode::On)),
|
||||||
*self = self.background(Some(AnsiCode::Reset));
|
[4, ..] => *self = self.underline(Some(AnsiCode::On)),
|
||||||
} else if ansi_params[0] == 21 {
|
[5, ..] => *self = self.blink_slow(Some(AnsiCode::On)),
|
||||||
*self = self.bold(Some(AnsiCode::Reset));
|
[6, ..] => *self = self.blink_fast(Some(AnsiCode::On)),
|
||||||
} else if ansi_params[0] == 22 {
|
[7, ..] => *self = self.reverse(Some(AnsiCode::On)),
|
||||||
*self = self.bold(Some(AnsiCode::Reset));
|
[8, ..] => *self = self.hidden(Some(AnsiCode::On)),
|
||||||
*self = self.dim(Some(AnsiCode::Reset));
|
[9, ..] => *self = self.strike(Some(AnsiCode::On)),
|
||||||
} else if ansi_params[0] == 23 {
|
[21, ..] => *self = self.bold(Some(AnsiCode::Reset)),
|
||||||
*self = self.italic(Some(AnsiCode::Reset));
|
[22, ..] => {
|
||||||
} else if ansi_params[0] == 24 {
|
*self = self.bold(Some(AnsiCode::Reset));
|
||||||
*self = self.underline(Some(AnsiCode::Reset));
|
*self = self.dim(Some(AnsiCode::Reset));
|
||||||
} else if ansi_params[0] == 25 {
|
|
||||||
*self = self.blink_slow(Some(AnsiCode::Reset));
|
|
||||||
*self = self.blink_fast(Some(AnsiCode::Reset));
|
|
||||||
} else if ansi_params[0] == 27 {
|
|
||||||
*self = self.reverse(Some(AnsiCode::Reset));
|
|
||||||
} else if ansi_params[0] == 28 {
|
|
||||||
*self = self.hidden(Some(AnsiCode::Reset));
|
|
||||||
} else if ansi_params[0] == 29 {
|
|
||||||
*self = self.strike(Some(AnsiCode::Reset));
|
|
||||||
} else if ansi_params[0] == 38 {
|
|
||||||
// TODO:
|
|
||||||
// * if 1 is 2 it is RGB, get it and next 3
|
|
||||||
// * if 1 is 5, do what we did until now
|
|
||||||
match ansi_params.get(1) {
|
|
||||||
Some(2) => {
|
|
||||||
let ansi_code = AnsiCode::RGBCode((
|
|
||||||
*ansi_params.get(2).unwrap() as u8,
|
|
||||||
*ansi_params.get(3).unwrap() as u8,
|
|
||||||
*ansi_params.get(4).unwrap() as u8,
|
|
||||||
));
|
|
||||||
*self = self.foreground(Some(ansi_code));
|
|
||||||
params_used += 4 // one for the indicator (2 in this case) and three for the rgb code
|
|
||||||
}
|
|
||||||
Some(5) => {
|
|
||||||
let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8);
|
|
||||||
*self = self.foreground(Some(ansi_code));
|
|
||||||
params_used += 2 // one for the indicator (5 in this case) and one for the color index
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
// this is a bug
|
|
||||||
// it means we got a color encoding we don't know how to handle (or is invalid)
|
|
||||||
params_used += 1; // even if it's a bug, let's not create an endless loop, eh?
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else if ansi_params[0] == 48 {
|
[23, ..] => *self = self.italic(Some(AnsiCode::Reset)),
|
||||||
match ansi_params.get(1) {
|
[24, ..] => *self = self.underline(Some(AnsiCode::Reset)),
|
||||||
Some(2) => {
|
[25, ..] => {
|
||||||
let ansi_code = AnsiCode::RGBCode((
|
*self = self.blink_slow(Some(AnsiCode::Reset));
|
||||||
*ansi_params.get(2).unwrap() as u8,
|
*self = self.blink_fast(Some(AnsiCode::Reset));
|
||||||
*ansi_params.get(3).unwrap() as u8,
|
}
|
||||||
*ansi_params.get(4).unwrap() as u8,
|
[27, ..] => *self = self.reverse(Some(AnsiCode::Reset)),
|
||||||
));
|
[28, ..] => *self = self.hidden(Some(AnsiCode::Reset)),
|
||||||
*self = self.background(Some(ansi_code));
|
[29, ..] => *self = self.strike(Some(AnsiCode::Reset)),
|
||||||
params_used += 4 // one for the indicator (2 in this case) and three for the rgb code
|
[30, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Black))),
|
||||||
}
|
[31, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Red))),
|
||||||
Some(5) => {
|
[32, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Green))),
|
||||||
let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8);
|
[33, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Yellow))),
|
||||||
*self = self.background(Some(ansi_code));
|
[34, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Blue))),
|
||||||
params_used += 2 // one for the indicator (5 in this case) and one for the color index
|
[35, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Magenta))),
|
||||||
}
|
[36, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Cyan))),
|
||||||
_ => {
|
[37, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::White))),
|
||||||
// this is a bug
|
[38, 2, ..] => {
|
||||||
// it means we got a color encoding we don't know how to handle (or is invalid)
|
let ansi_code = AnsiCode::RGBCode((
|
||||||
params_used += 1; // even if it's a bug, let's not create an endless loop, eh?
|
*ansi_params.get(2).unwrap() as u8,
|
||||||
}
|
*ansi_params.get(3).unwrap() as u8,
|
||||||
|
*ansi_params.get(4).unwrap() as u8,
|
||||||
|
));
|
||||||
|
*self = self.foreground(Some(ansi_code));
|
||||||
|
params_used += 4 // one for the indicator (2 in this case) and three for the rgb code
|
||||||
|
}
|
||||||
|
[38, 5, ..] => {
|
||||||
|
let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8);
|
||||||
|
*self = self.foreground(Some(ansi_code));
|
||||||
|
params_used += 2 // one for the indicator (5 in this case) and one for the color index
|
||||||
|
}
|
||||||
|
[38, ..] => {
|
||||||
|
// this is a bug
|
||||||
|
// it means we got a color encoding we don't know how to handle (or is invalid)
|
||||||
|
params_used += 1; // even if it's a bug, let's not create an endless loop, eh?
|
||||||
|
}
|
||||||
|
[39, ..] => *self = self.foreground(Some(AnsiCode::Reset)),
|
||||||
|
[40, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Black))),
|
||||||
|
[41, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Red))),
|
||||||
|
[42, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Green))),
|
||||||
|
[43, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Yellow))),
|
||||||
|
[44, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Blue))),
|
||||||
|
[45, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Magenta))),
|
||||||
|
[46, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Cyan))),
|
||||||
|
[47, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::White))),
|
||||||
|
[48, 2, ..] => {
|
||||||
|
let ansi_code = AnsiCode::RGBCode((
|
||||||
|
*ansi_params.get(2).unwrap() as u8,
|
||||||
|
*ansi_params.get(3).unwrap() as u8,
|
||||||
|
*ansi_params.get(4).unwrap() as u8,
|
||||||
|
));
|
||||||
|
*self = self.background(Some(ansi_code));
|
||||||
|
params_used += 4 // one for the indicator (2 in this case) and three for the rgb code
|
||||||
|
}
|
||||||
|
[48, 5, ..] => {
|
||||||
|
let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8);
|
||||||
|
*self = self.background(Some(ansi_code));
|
||||||
|
params_used += 2 // one for the indicator (5 in this case) and one for the color index
|
||||||
|
}
|
||||||
|
[48, ..] => {
|
||||||
|
// this is a bug
|
||||||
|
// it means we got a color encoding we don't know how to handle (or is invalid)
|
||||||
|
params_used += 1; // even if it's a bug, let's not create an endless loop, eh?
|
||||||
|
}
|
||||||
|
[49, ..] => *self = self.background(Some(AnsiCode::Reset)),
|
||||||
|
_ => {
|
||||||
|
// if this happens, it's a bug
|
||||||
|
let _ = debug_log_to_file(format!("unhandled csi m code {:?}", ansi_params));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
} else if ansi_params[0] == 1 {
|
|
||||||
*self = self.bold(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 2 {
|
|
||||||
*self = self.dim(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 3 {
|
|
||||||
*self = self.italic(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 4 {
|
|
||||||
*self = self.underline(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 5 {
|
|
||||||
*self = self.blink_slow(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 6 {
|
|
||||||
*self = self.blink_fast(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 7 {
|
|
||||||
*self = self.reverse(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 8 {
|
|
||||||
*self = self.hidden(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 9 {
|
|
||||||
*self = self.strike(Some(AnsiCode::On));
|
|
||||||
} else if ansi_params[0] == 30 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Black)));
|
|
||||||
} else if ansi_params[0] == 31 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Red)));
|
|
||||||
} else if ansi_params[0] == 32 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Green)));
|
|
||||||
} else if ansi_params[0] == 33 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Yellow)));
|
|
||||||
} else if ansi_params[0] == 34 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Blue)));
|
|
||||||
} else if ansi_params[0] == 35 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Magenta)));
|
|
||||||
} else if ansi_params[0] == 36 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Cyan)));
|
|
||||||
} else if ansi_params[0] == 37 {
|
|
||||||
*self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::White)));
|
|
||||||
} else if ansi_params[0] == 40 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::Black)));
|
|
||||||
} else if ansi_params[0] == 41 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::Red)));
|
|
||||||
} else if ansi_params[0] == 42 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::Green)));
|
|
||||||
} else if ansi_params[0] == 43 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::Yellow)));
|
|
||||||
} else if ansi_params[0] == 44 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::Blue)));
|
|
||||||
} else if ansi_params[0] == 45 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::Magenta)));
|
|
||||||
} else if ansi_params[0] == 46 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::Cyan)));
|
|
||||||
} else if ansi_params[0] == 47 {
|
|
||||||
*self = self.background(Some(AnsiCode::NamedColor(NamedColor::White)));
|
|
||||||
} else {
|
|
||||||
// if this happens, it's a bug
|
|
||||||
let _ = debug_log_to_file(format!("unhandled csi m code {:?}", ansi_params));
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
if let Some(next_params) = ansi_params.get(params_used..) {
|
if let Some(next_params) = ansi_params.get(params_used..) {
|
||||||
if next_params.len() > 0 {
|
if next_params.len() > 0 {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue