ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

formatter: extract repeated code for writing new color code

Browse source 
The implementations of `add_label()` and `remove_label()` had a lot of
duplicated code, and we would soon have more duplication if we didn't
extract it to shared function.
This commit is contained in:
Martin von Zweigbergk 2023-01-07 09:36:19 -08:00 committed by Martin von Zweigbergk
parent 4b80c259cf
commit fbab5e1bd9
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/formatter.rs
View file

@ -164,7 +164,7 @@ fn config_colors(config: &config::Config) -> HashMap<String, String> {
result
}
impl<W> ColorFormatter<W> {
impl<W: Write> ColorFormatter<W> {
pub fn new(output: W, colors: Arc<HashMap<String, String>>) -> ColorFormatter<W> {
ColorFormatter {
output,
@ -214,6 +214,15 @@ impl<W> ColorFormatter<W> {
color
}
}
fn write_new_color(&mut self) -> io::Result<()> {
let new_color = self.current_color();
if new_color != self.current_color {
self.output.write_all(&new_color)?;
self.current_color = new_color;
}
Ok(())
}
}
fn color_for_name(color_name: &str) -> Vec<u8> {
@ -251,22 +260,12 @@ impl<W: Write> Write for ColorFormatter<W> {
impl<W: Write> Formatter for ColorFormatter<W> {
fn add_label(&mut self, label: &str) -> io::Result<()> {
self.labels.push(label.to_owned());
let new_color = self.current_color();
if new_color != self.current_color {
self.output.write_all(&new_color)?;
self.current_color = new_color;
}
Ok(())
self.write_new_color()
}
fn remove_label(&mut self) -> io::Result<()> {
self.labels.pop();
let new_color = self.current_color();
if new_color != self.current_color {
self.output.write_all(&new_color)?;
self.current_color = new_color;
}
Ok(())
self.write_new_color()
}
}