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

Fix #182

This commit is contained in:
eth-p 2018-07-05 13:24:34 -07:00 committed by David Peter
parent 8b92aae23f
commit 34811b8161
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/features.rs
View File

@ -64,6 +64,7 @@ pub fn print_files(assets: &HighlightingAssets, config: &Config) -> Result<bool>
let mut no_errors: bool = true;
for file in &config.files {
printer.ansi_prefix_sgr.clear();
printer.line_changes = file.and_then(|filename| get_git_diff(filename));
let syntax = assets.get_syntax(config.language, *file);

35
src/printer.rs
View File

@ -18,6 +18,7 @@ pub struct Printer<'a> {
pub config: &'a Config<'a>,
decorations: Vec<Box<Decoration>>,
panel_width: usize,
pub ansi_prefix_sgr: String,
pub line_number: usize,
pub line_changes: Option<LineChanges>,
}
@ -67,6 +68,7 @@ impl<'a> Printer<'a> {
colors,
config,
decorations,
ansi_prefix_sgr: String::new(),
line_number: 0,
line_changes: None,
}
@ -124,8 +126,7 @@ impl<'a> Printer<'a> {
// Line decorations.
if self.panel_width > 0 {
let decorations = self
.decorations
let decorations = self.decorations
.iter()
.map(|ref d| d.generate(self.line_number, false, self))
.collect::<Vec<_>>();
@ -158,12 +159,17 @@ impl<'a> Printer<'a> {
} else {
for &(style, region) in regions.iter() {
let mut ansi_iterator = AnsiCodeIterator::new(region);
let mut ansi_prefix = "";
let mut ansi_prefix: String = String::new();
for chunk in ansi_iterator {
match chunk {
// ANSI escape passthrough.
(text, true) => {
ansi_prefix = text;
if text.chars().last().unwrap() == 'm' {
self.ansi_prefix_sgr.push_str(text);
ansi_prefix.push_str(text);
} else {
ansi_prefix.push_str(text);
}
}
// Regular text.
@ -185,7 +191,10 @@ impl<'a> Printer<'a> {
"{}",
as_terminal_escaped(
style,
&*format!("{}{}", ansi_prefix, text),
&*format!(
"{}{}{}",
self.ansi_prefix_sgr, ansi_prefix, text
),
self.config.true_color,
self.config.colored_output,
)
@ -200,9 +209,11 @@ impl<'a> Printer<'a> {
"{} ",
self.decorations
.iter()
.map(|ref d| d
.generate(self.line_number, true, self)
.text)
.map(|ref d| d.generate(
self.line_number,
true,
self
).text)
.collect::<Vec<String>>()
.join(" ")
))
@ -221,13 +232,19 @@ impl<'a> Printer<'a> {
"{}\n{}",
as_terminal_escaped(
style,
&*format!("{}{}", ansi_prefix, text),
&*format!(
"{}{}{}",
self.ansi_prefix_sgr, ansi_prefix, text
),
self.config.true_color,
self.config.colored_output,
),
panel_wrap.clone().unwrap()
)?;
}
// Clear the ANSI prefix buffer.
ansi_prefix.clear();
}
}
}