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

Use syntect newlines mode (instead of nonewlines)

This commit is contained in:
sharkdp 2018-05-06 14:23:25 +02:00 committed by David Peter
parent ec606e5dcc
commit b625d07c34
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/syntax_set
View File

Binary file not shown.

29
src/main.rs
View File

@ -169,7 +169,7 @@ fn print_file<P: AsRef<Path>>(
filename: P, filename: P,
line_changes: &Option<LineChanges>, line_changes: &Option<LineChanges>,
) -> Result<()> { ) -> Result<()> {
let reader = BufReader::new(File::open(filename.as_ref())?); let mut reader = BufReader::new(File::open(filename.as_ref())?);
let syntax = match options.language { let syntax = match options.language {
Some(language) => syntax_set.find_syntax_by_token(language), Some(language) => syntax_set.find_syntax_by_token(language),
None => syntax_set.find_syntax_for_file(filename.as_ref())?, None => syntax_set.find_syntax_for_file(filename.as_ref())?,
@ -206,10 +206,21 @@ fn print_file<P: AsRef<Path>>(
OptionsStyle::Plain => {} OptionsStyle::Plain => {}
}; };
for (idx, maybe_line) in reader.lines().enumerate() { let mut line_nr = 1;
let line_nr = idx + 1; let mut line_buffer = String::new();
let line = maybe_line.unwrap_or_else(|_| "<INVALID UTF-8>".into()); loop {
let regions = highlighter.highlight(&line); line_buffer.clear();
let num_bytes = reader.read_line(&mut line_buffer);
let line = match num_bytes {
Ok(0) => {
break;
}
Ok(_) => &line_buffer,
Err(_) => "<bat: INVALID UTF-8>\n",
};
let regions = highlighter.highlight(line);
let line_change = if let Some(ref changes) = *line_changes { let line_change = if let Some(ref changes) = *line_changes {
match changes.get(&(line_nr as u32)) { match changes.get(&(line_nr as u32)) {
@ -225,12 +236,12 @@ fn print_file<P: AsRef<Path>>(
match options.style { match options.style {
// Show only content for plain style // Show only content for plain style
OptionsStyle::Plain => writeln!( OptionsStyle::Plain => write!(
handle, handle,
"{}", "{}",
as_terminal_escaped(&regions, options.true_color, options.colored_output) as_terminal_escaped(&regions, options.true_color, options.colored_output)
)?, )?,
_ => writeln!( _ => write!(
handle, handle,
"{} {} {} {}", "{} {} {} {}",
colors.line_number.paint(format!("{:4}", line_nr)), colors.line_number.paint(format!("{:4}", line_nr)),
@ -243,6 +254,8 @@ fn print_file<P: AsRef<Path>>(
as_terminal_escaped(&regions, options.true_color, options.colored_output) as_terminal_escaped(&regions, options.true_color, options.colored_output)
)?, )?,
} }
line_nr += 1;
} }
// Show bars for all but plain style // Show bars for all but plain style
@ -358,7 +371,7 @@ impl HighlightingAssets {
let mut syntax_set = SyntaxSet::new(); let mut syntax_set = SyntaxSet::new();
let syntax_dir = config_dir.join("syntax"); let syntax_dir = config_dir.join("syntax");
let _ = syntax_set.load_syntaxes(syntax_dir, false); let _ = syntax_set.load_syntaxes(syntax_dir, true);
syntax_set.load_plain_text_syntax(); syntax_set.load_plain_text_syntax();
Ok(HighlightingAssets { Ok(HighlightingAssets {