MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-31 10:11:07 +00:00
Code Issues Releases Wiki Activity

Replace our own macros to write buffers with standard macros

Browse Source
This commit is contained in:
rhysd 2023-10-04 20:44:19 +09:00 committed by David Peter
parent 0937d575fd
commit e5c81ed41e
1 changed files with 27 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/printer.rs
View File

@ -41,28 +41,11 @@ pub enum OutputHandle<'a> {
FmtWrite(&'a mut dyn fmt::Write), FmtWrite(&'a mut dyn fmt::Write),
} }
macro_rules! write_handle { impl<'a> OutputHandle<'a> {
($dst:expr, $($arg:tt)*) => { fn write_fmt(&mut self, args: fmt::Arguments<'_>) -> Result<()> {
match $dst { match self {
OutputHandle::IoWrite(ref mut handle) => { Self::IoWrite(handle) => handle.write_fmt(args).map_err(Into::into),
write!(handle, $($arg)*).map_err(|e| Error::from(e)) Self::FmtWrite(handle) => handle.write_fmt(args).map_err(Into::into),
}
OutputHandle::FmtWrite(ref mut handle) => {
write!(handle, $($arg)*).map_err(|e| Error::from(e))
}
}
}
}
macro_rules! writeln_handle {
($dst:expr, $($arg:tt)*) => {
match $dst {
OutputHandle::IoWrite(ref mut handle) => {
writeln!(handle, $($arg)*).map_err(|e| Error::from(e))
}
OutputHandle::FmtWrite(ref mut handle) => {
writeln!(handle, $($arg)*).map_err(|e| Error::from(e))
}
} }
} }
} }
@ -129,7 +112,7 @@ impl<'a> Printer for SimplePrinter<'a> {
self.config.tab_width, self.config.tab_width,
self.config.nonprintable_notation, self.config.nonprintable_notation,
); );
write_handle!(handle, "{}", line)?; write!(handle, "{}", line)?;
} else { } else {
match handle { match handle {
OutputHandle::IoWrite(handle) => handle.write_all(line_buffer)?, OutputHandle::IoWrite(handle) => handle.write_all(line_buffer)?,
@ -266,7 +249,7 @@ impl<'a> InteractivePrinter<'a> {
handle: &mut OutputHandle, handle: &mut OutputHandle,
style: Style, style: Style,
) -> Result<()> { ) -> Result<()> {
writeln_handle!( writeln!(
handle, handle,
"{}", "{}",
style.paint("─".repeat(self.config.term_width)) style.paint("─".repeat(self.config.term_width))
@ -280,7 +263,7 @@ impl<'a> InteractivePrinter<'a> {
} else { } else {
let hline = "─".repeat(self.config.term_width - (self.panel_width + 1)); let hline = "─".repeat(self.config.term_width - (self.panel_width + 1));
let hline = format!("{}{}{}", "─".repeat(self.panel_width), grid_char, hline); let hline = format!("{}{}{}", "─".repeat(self.panel_width), grid_char, hline);
writeln_handle!(handle, "{}", self.colors.grid.paint(hline))?; writeln!(handle, "{}", self.colors.grid.paint(hline))?;
} }
Ok(()) Ok(())
@ -306,7 +289,7 @@ impl<'a> InteractivePrinter<'a> {
fn print_header_component_indent(&mut self, handle: &mut OutputHandle) -> Result<()> { fn print_header_component_indent(&mut self, handle: &mut OutputHandle) -> Result<()> {
if self.config.style_components.grid() { if self.config.style_components.grid() {
write_handle!( write!(
handle, handle,
"{}{}", "{}{}",
" ".repeat(self.panel_width), " ".repeat(self.panel_width),
@ -315,7 +298,7 @@ impl<'a> InteractivePrinter<'a> {
.paint(if self.panel_width > 0 { "│ " } else { "" }), .paint(if self.panel_width > 0 { "│ " } else { "" }),
) )
} else { } else {
write_handle!(handle, "{}", " ".repeat(self.panel_width)) write!(handle, "{}", " ".repeat(self.panel_width))
} }
} }
@ -342,7 +325,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
if !self.config.style_components.header() { if !self.config.style_components.header() {
if Some(ContentType::BINARY) == self.content_type && !self.config.show_nonprintable { if Some(ContentType::BINARY) == self.content_type && !self.config.show_nonprintable {
writeln_handle!( writeln!(
handle, handle,
"{}: Binary content from {} will not be printed to the terminal \ "{}: Binary content from {} will not be printed to the terminal \
(but will be present if the output of 'bat' is piped). You can use 'bat -A' \ (but will be present if the output of 'bat' is piped). You can use 'bat -A' \
@ -390,7 +373,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
} else { } else {
// Only pad space between files, if we haven't already drawn a horizontal rule // Only pad space between files, if we haven't already drawn a horizontal rule
if add_header_padding && !self.config.style_components.rule() { if add_header_padding && !self.config.style_components.rule() {
writeln_handle!(handle,)?; writeln!(handle)?;
} }
} }
@ -398,7 +381,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
self.print_header_component_indent(handle)?; self.print_header_component_indent(handle)?;
match component { match component {
StyleComponent::HeaderFilename => writeln_handle!( StyleComponent::HeaderFilename => writeln!(
handle, handle,
"{}{}{}", "{}{}{}",
description description
@ -414,7 +397,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
.size .size
.map(|s| format!("{}", ByteSize(s))) .map(|s| format!("{}", ByteSize(s)))
.unwrap_or_else(|| "-".into()); .unwrap_or_else(|| "-".into());
writeln_handle!(handle, "Size: {}", self.colors.header_value.paint(bsize)) writeln!(handle, "Size: {}", self.colors.header_value.paint(bsize))
} }
_ => Ok(()), _ => Ok(()),
} }
@ -454,7 +437,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
let snip_right = let snip_right =
" ─".repeat((self.config.term_width - panel_count - snip_left_count - title_count) / 2); " ─".repeat((self.config.term_width - panel_count - snip_left_count - title_count) / 2);
writeln_handle!( writeln!(
handle, handle,
"{}", "{}",
self.colors self.colors
@ -553,7 +536,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
.map(|d| d.generate(line_number, false, self)); .map(|d| d.generate(line_number, false, self));
for deco in decorations { for deco in decorations {
write_handle!(handle, "{} ", deco.text)?; write!(handle, "{} ", deco.text)?;
cursor_max -= deco.width + 1; cursor_max -= deco.width + 1;
} }
} }
@ -571,7 +554,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
// ANSI escape passthrough. // ANSI escape passthrough.
(ansi, true) => { (ansi, true) => {
self.ansi_style.update(ansi); self.ansi_style.update(ansi);
write_handle!(handle, "{}", ansi)?; write!(handle, "{}", ansi)?;
} }
// Regular text. // Regular text.
@ -579,7 +562,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
let text = &*self.preprocess(text, &mut cursor_total); let text = &*self.preprocess(text, &mut cursor_total);
let text_trimmed = text.trim_end_matches(|c| c == '\r' || c == '\n'); let text_trimmed = text.trim_end_matches(|c| c == '\r' || c == '\n');
write_handle!( write!(
handle, handle,
"{}", "{}",
as_terminal_escaped( as_terminal_escaped(
@ -604,13 +587,9 @@ impl<'a> Printer for InteractivePrinter<'a> {
} else { } else {
0 0
}; };
write_handle!( write!(handle, "{}", ansi_style.paint(" ".repeat(width)))?;
handle,
"{}",
ansi_style.paint(" ".repeat(width))
)?;
} }
write_handle!(handle, "{}", &text[text_trimmed.len()..])?; write!(handle, "{}", &text[text_trimmed.len()..])?;
} }
} }
} }
@ -618,7 +597,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
} }
if !self.config.style_components.plain() && line.bytes().next_back() != Some(b'\n') { if !self.config.style_components.plain() && line.bytes().next_back() != Some(b'\n') {
writeln_handle!(handle,)?; writeln!(handle)?;
} }
} else { } else {
for &(style, region) in &regions { for &(style, region) in &regions {
@ -628,7 +607,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
// ANSI escape passthrough. // ANSI escape passthrough.
(ansi, true) => { (ansi, true) => {
self.ansi_style.update(ansi); self.ansi_style.update(ansi);
write_handle!(handle, "{}", ansi)?; write!(handle, "{}", ansi)?;
} }
// Regular text. // Regular text.
@ -673,7 +652,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
} }
// It wraps. // It wraps.
write_handle!( write!(
handle, handle,
"{}\n{}", "{}\n{}",
as_terminal_escaped( as_terminal_escaped(
@ -699,7 +678,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
// flush the buffer // flush the buffer
cursor += current_width; cursor += current_width;
write_handle!( write!(
handle, handle,
"{}", "{}",
as_terminal_escaped( as_terminal_escaped(
@ -722,18 +701,18 @@ impl<'a> Printer for InteractivePrinter<'a> {
..Default::default() ..Default::default()
}; };
write_handle!( write!(
handle, handle,
"{}", "{}",
ansi_style.paint(" ".repeat(cursor_max - cursor)) ansi_style.paint(" ".repeat(cursor_max - cursor))
)?; )?;
} }
writeln_handle!(handle,)?; writeln!(handle)?;
} }
if highlight_this_line && self.config.theme == "ansi" { if highlight_this_line && self.config.theme == "ansi" {
self.ansi_style.update("^[24m"); self.ansi_style.update("^[24m");
write_handle!(handle, "\x1B[24m")?; write!(handle, "\x1B[24m")?;
} }
Ok(()) Ok(())