From a64cfcc699fb4ac275f439b54220ab9fffdb702d Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 29 Dec 2020 23:54:45 +0800 Subject: [PATCH] Fix for #684 (#686) * Fix for #684 Bascially the implementation as per this instruction: https://github.com/XAMPPRocky/tokei/pull/685#issuecomment-752112937 * refactor --- src/cli_utils.rs | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/cli_utils.rs b/src/cli_utils.rs index 491d6d30a..50c2d4b83 100644 --- a/src/cli_utils.rs +++ b/src/cli_utils.rs @@ -191,6 +191,28 @@ impl Printer { ) } + fn print_language_in_print_total(&mut self, language: &Language) -> io::Result<()> + where + W: Write, + { + self.print_language_name(language.inaccurate, "Total", None)?; + write!(self.writer, " ")?; + writeln!( + self.writer, + "{:>6} {:>12} {:>12} {:>12} {:>12}", + language + .children + .values() + .map(Vec::len) + .sum::() + .to_formatted_string(&self.number_format), + language.lines().to_formatted_string(&self.number_format), + language.code.to_formatted_string(&self.number_format), + language.comments.to_formatted_string(&self.number_format), + language.blanks.to_formatted_string(&self.number_format), + ) + } + pub fn print_language_name( &mut self, inaccurate: bool, @@ -431,7 +453,7 @@ impl Printer { pub fn print_total(&mut self, languages: tokei::Languages) -> io::Result<()> { let total = languages.total(); self.print_row()?; - self.print_language(&total, "Total")?; + self.print_language_in_print_total(&total)?; self.print_row() } }