MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-03-13 14:18:35 +00:00
Code Issues Releases Wiki Activity

Merge 287123c6ce39a642050d0d3f8ee953172e942fbd into 3eb79d63ceda959a7b2c1ae46ea34593656d1488

Browse Source
This commit is contained in:
Pit 2018-05-06 09:22:58 +00:00 committed by GitHub
commit f029b6a1ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@ -57,6 +57,7 @@ use errors::*;
enum OptionsStyle {
Plain,
LineChanges,
LineNumbers,
Full,
}
@ -162,7 +163,7 @@ fn print_file<P: AsRef<Path>>(
let (_, term_width) = term.size();
let term_width = term_width as usize;
// Show file name and bars for all but plain style
// Show file name and bars for line-numbers and full styles
match options.style {
OptionsStyle::LineNumbers | OptionsStyle::Full => {
print_horizontal_line(&mut handle, '┬', term_width)?;
@ -177,7 +178,7 @@ fn print_file<P: AsRef<Path>>(
print_horizontal_line(handle, '┼', term_width)?;
}
OptionsStyle::Plain => {}
OptionsStyle::LineChanges | OptionsStyle::Plain => {}
};
@ -203,6 +204,13 @@ fn print_file<P: AsRef<Path>>(
OptionsStyle::Plain => writeln!(
handle,
"{}", as_terminal_escaped(&regions, options.true_color))?,
// Show content and git diff for line-changes style
OptionsStyle::LineChanges => writeln!(
handle,
"{} {}",
line_change,
as_terminal_escaped(&regions, options.true_color)
)?,
_ =>
writeln!(
handle,
@ -223,7 +231,7 @@ fn print_file<P: AsRef<Path>>(
match options.style {
OptionsStyle::LineNumbers | OptionsStyle::Full =>
print_horizontal_line(handle, '┴', term_width)?,
OptionsStyle::Plain => {}
OptionsStyle::LineChanges | OptionsStyle::Plain => {}
};
Ok(())
@ -446,7 +454,7 @@ fn run() -> Result<()> {
Arg::with_name("style")
.short("s")
.long("style")
.possible_values(&["plain", "line-numbers", "full"])
.possible_values(&["plain", "line-changes", "line-numbers", "full"])
.default_value("full")
.help("Additional info to display alongwith content"),
)
@ -468,6 +476,7 @@ fn run() -> Result<()> {
true_color: is_truecolor_terminal(),
style: match app_matches.value_of("style").unwrap() {
"plain" => OptionsStyle::Plain,
"line-changes" => OptionsStyle::LineChanges,
"line-numbers" => OptionsStyle::LineNumbers,
_ => OptionsStyle::Full,
},