MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-22 04:48:48 +00:00
Code Issues Releases Wiki Activity

Compute 'longest' for non-hidden languages only

Browse Source
This commit is contained in:
sharkdp 2018-05-08 22:13:37 +02:00 committed by David Peter
parent a4150600af
commit ebdef04c8f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.rs
View File

@ -569,7 +569,9 @@ fn run() -> Result<()> {
if app_matches.is_present("list-languages") { if app_matches.is_present("list-languages") {
let languages = assets.syntax_set.syntaxes(); let languages = assets.syntax_set.syntaxes();
let longest = languages.iter() let longest = languages
.iter()
.filter(|s| !s.hidden)
.map(|s| s.name.len()) .map(|s| s.name.len())
.max() .max()
.unwrap_or(32); // Fallback width if they have no language definitions. .unwrap_or(32); // Fallback width if they have no language definitions.
@ -590,12 +592,13 @@ fn run() -> Result<()> {
let mut extension = lang.file_extensions.iter().peekable(); let mut extension = lang.file_extensions.iter().peekable();
while let Some(word) = extension.next() { while let Some(word) = extension.next() {
// If we can't fit this word in, then create a line break and align it in. // If we can't fit this word in, then create a line break and align it in.
if num_chars + word.len() + comma_separator.len() >= desired_width { let new_chars = word.len() + comma_separator.len();
if num_chars + new_chars >= desired_width {
num_chars = 0; num_chars = 0;
print!("\n{:width$}{}", "", separator, width = longest); print!("\n{:width$}{}", "", separator, width = longest);
} }
num_chars += word.len() + comma_separator.len(); num_chars += new_chars;
print!("{}", word); print!("{}", word);
if extension.peek().is_some() { if extension.peek().is_some() {
print!("{}", comma_separator); print!("{}", comma_separator);