extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-04-28 13:38:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

disable rule when grid enabled, and print warning

Browse Source
This commit is contained in:
Tom Milligan 2020-10-12 08:40:01 +01:00
parent d7da4f5f2b
commit 3015ebfba1
No known key found for this signature in database
GPG Key ID: BFF10895C45328D2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/bat/app.rs
View File

@ -288,8 +288,8 @@ impl App {
fn style_components(&self) -> Result<StyleComponents> { fn style_components(&self) -> Result<StyleComponents> {
let matches = &self.matches; let matches = &self.matches;
Ok(StyleComponents( let mut styled_components =
if matches.value_of("decorations") == Some("never") { StyleComponents(if matches.value_of("decorations") == Some("never") {
HashSet::new() HashSet::new()
} else if matches.is_present("number") { } else if matches.is_present("number") {
[StyleComponent::LineNumbers].iter().cloned().collect() [StyleComponent::LineNumbers].iter().cloned().collect()
@ -323,7 +323,17 @@ impl App {
acc.extend(components.iter().cloned()); acc.extend(components.iter().cloned());
acc acc
}) })
}, });
))
// If `grid` is set, remove `rule` as it is a subset of `grid`, and print a warning.
if styled_components.grid() && styled_components.0.remove(&StyleComponent::Rule) {
use ansi_term::Colour::Yellow;
eprintln!(
"{}: Style 'rule' is a subset of style 'grid', 'rule' will not be visible.",
Yellow.paint("[bat warning]"),
);
}
Ok(styled_components)
} }
} }