pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(style): bring the nice match back (#92)

Browse source 
* 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 2020-12-10 10:02:37 +01:00 • committed by GitHub
parent a933b8320b
commit d950bab5ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 84 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
src/terminal_pane/terminal_character.rs
View file

@ -302,36 +302,40 @@ 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)),
[8, ..] => *self = self.hidden(Some(AnsiCode::On)),
[9, ..] => *self = self.strike(Some(AnsiCode::On)),
[21, ..] => *self = self.bold(Some(AnsiCode::Reset)),
[22, ..] => {
*self = self.bold(Some(AnsiCode::Reset)); *self = self.bold(Some(AnsiCode::Reset));
*self = self.dim(Some(AnsiCode::Reset)); *self = self.dim(Some(AnsiCode::Reset));
} else if ansi_params[0] == 23 { }
*self = self.italic(Some(AnsiCode::Reset)); [23, ..] => *self = self.italic(Some(AnsiCode::Reset)),
} else if ansi_params[0] == 24 { [24, ..] => *self = self.underline(Some(AnsiCode::Reset)),
*self = self.underline(Some(AnsiCode::Reset)); [25, ..] => {
} else if ansi_params[0] == 25 {
*self = self.blink_slow(Some(AnsiCode::Reset)); *self = self.blink_slow(Some(AnsiCode::Reset));
*self = self.blink_fast(Some(AnsiCode::Reset)); *self = self.blink_fast(Some(AnsiCode::Reset));
} else if ansi_params[0] == 27 { }
*self = self.reverse(Some(AnsiCode::Reset)); [27, ..] => *self = self.reverse(Some(AnsiCode::Reset)),
} else if ansi_params[0] == 28 { [28, ..] => *self = self.hidden(Some(AnsiCode::Reset)),
*self = self.hidden(Some(AnsiCode::Reset)); [29, ..] => *self = self.strike(Some(AnsiCode::Reset)),
} else if ansi_params[0] == 29 { [30, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Black))),
*self = self.strike(Some(AnsiCode::Reset)); [31, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Red))),
} else if ansi_params[0] == 38 { [32, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Green))),
// TODO: [33, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Yellow))),
// * if 1 is 2 it is RGB, get it and next 3 [34, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Blue))),
// * if 1 is 5, do what we did until now [35, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Magenta))),
match ansi_params.get(1) { [36, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::Cyan))),
Some(2) => { [37, ..] => *self = self.foreground(Some(AnsiCode::NamedColor(NamedColor::White))),
[38, 2, ..] => {
let ansi_code = AnsiCode::RGBCode(( let ansi_code = AnsiCode::RGBCode((
*ansi_params.get(2).unwrap() as u8, *ansi_params.get(2).unwrap() as u8,
*ansi_params.get(3).unwrap() as u8, *ansi_params.get(3).unwrap() as u8,
@ -340,20 +344,26 @@ impl CharacterStyles {
*self = self.foreground(Some(ansi_code)); *self = self.foreground(Some(ansi_code));
params_used += 4 // one for the indicator (2 in this case) and three for the rgb code params_used += 4 // one for the indicator (2 in this case) and three for the rgb code
} }
Some(5) => { [38, 5, ..] => {
let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8); let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8);
*self = self.foreground(Some(ansi_code)); *self = self.foreground(Some(ansi_code));
params_used += 2 // one for the indicator (5 in this case) and one for the color index params_used += 2 // one for the indicator (5 in this case) and one for the color index
} }
_ => { [38, ..] => {
// this is a bug // this is a bug
// it means we got a color encoding we don't know how to handle (or is invalid) // 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? params_used += 1; // even if it's a bug, let's not create an endless loop, eh?
} }
} [39, ..] => *self = self.foreground(Some(AnsiCode::Reset)),
} else if ansi_params[0] == 48 { [40, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Black))),
match ansi_params.get(1) { [41, ..] => *self = self.background(Some(AnsiCode::NamedColor(NamedColor::Red))),
Some(2) => { [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(( let ansi_code = AnsiCode::RGBCode((
*ansi_params.get(2).unwrap() as u8, *ansi_params.get(2).unwrap() as u8,
*ansi_params.get(3).unwrap() as u8, *ansi_params.get(3).unwrap() as u8,
@ -362,72 +372,23 @@ impl CharacterStyles {
*self = self.background(Some(ansi_code)); *self = self.background(Some(ansi_code));
params_used += 4 // one for the indicator (2 in this case) and three for the rgb code params_used += 4 // one for the indicator (2 in this case) and three for the rgb code
} }
Some(5) => { [48, 5, ..] => {
let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8); let ansi_code = AnsiCode::ColorIndex(*ansi_params.get(2).unwrap() as u8);
*self = self.background(Some(ansi_code)); *self = self.background(Some(ansi_code));
params_used += 2 // one for the indicator (5 in this case) and one for the color index params_used += 2 // one for the indicator (5 in this case) and one for the color index
} }
_ => { [48, ..] => {
// this is a bug // this is a bug
// it means we got a color encoding we don't know how to handle (or is invalid) // 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? params_used += 1; // even if it's a bug, let's not create an endless loop, eh?
} }
} [49, ..] => *self = self.background(Some(AnsiCode::Reset)),
} 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 // if this happens, it's a bug
let _ = debug_log_to_file(format!("unhandled csi m code {:?}", ansi_params)); let _ = debug_log_to_file(format!("unhandled csi m code {:?}", ansi_params));
return; 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 {
self.add_style_from_ansi_params(next_params); self.add_style_from_ansi_params(next_params);