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

Disabled tab expansion when decorations and pager are not used.

This commit is contained in:
eth-p 2018-09-10 20:12:13 -07:00
parent 7cdcdbb31d
commit eb6e43b9a9
No known key found for this signature in database
GPG Key ID: 1F8DF8091CD46FBC
1 changed files with 204 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

400
src/app.rs
View File

@ -16,7 +16,7 @@ use errors::*;
use line_range::LineRange; use line_range::LineRange;
use style::{OutputComponent, OutputComponents, OutputWrap}; use style::{OutputComponent, OutputComponents, OutputWrap};
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy, PartialEq)]
pub enum PagingMode { pub enum PagingMode {
Always, Always,
QuitIfOneScreen, QuitIfOneScreen,
@ -133,7 +133,7 @@ impl App {
to read from standard input.", to read from standard input.",
).multiple(true) ).multiple(true)
.empty_values(false), .empty_values(false),
) )
.arg( .arg(
Arg::with_name("language") Arg::with_name("language")
.short("l") .short("l")
@ -147,204 +147,204 @@ impl App {
language names and file extensions." language names and file extensions."
).takes_value(true), ).takes_value(true),
).arg( ).arg(
Arg::with_name("list-languages") Arg::with_name("list-languages")
.long("list-languages") .long("list-languages")
.conflicts_with("list-themes") .conflicts_with("list-themes")
.help("Display all supported languages.") .help("Display all supported languages.")
.long_help("Display a list of supported languages for syntax highlighting."), .long_help("Display a list of supported languages for syntax highlighting."),
).arg( ).arg(
Arg::with_name("theme") Arg::with_name("theme")
.long("theme") .long("theme")
.overrides_with("theme") .overrides_with("theme")
.takes_value(true) .takes_value(true)
.help("Set the color theme for syntax highlighting.") .help("Set the color theme for syntax highlighting.")
.long_help( .long_help(
"Set the theme for syntax highlighting. Use '--list-themes' to \ "Set the theme for syntax highlighting. Use '--list-themes' to \
see all available themes. To set a default theme, export the \ see all available themes. To set a default theme, export the \
BAT_THEME environment variable (e.g.: export \ BAT_THEME environment variable (e.g.: export \
BAT_THEME=\"TwoDark\").", BAT_THEME=\"TwoDark\").",
), ),
).arg( ).arg(
Arg::with_name("list-themes") Arg::with_name("list-themes")
.long("list-themes") .long("list-themes")
.help("Display all supported highlighting themes.") .help("Display all supported highlighting themes.")
.long_help("Display a list of supported themes for syntax highlighting."), .long_help("Display a list of supported themes for syntax highlighting."),
).arg( ).arg(
Arg::with_name("style") Arg::with_name("style")
.long("style") .long("style")
.value_name("style-components") .value_name("style-components")
.use_delimiter(true) .use_delimiter(true)
.takes_value(true) .takes_value(true)
.possible_values(&[ .possible_values(&[
"auto", "full", "plain", "changes", "header", "grid", "numbers", "auto", "full", "plain", "changes", "header", "grid", "numbers",
]).default_value("auto") ]).default_value("auto")
.help("Comma-separated list of style elements to display.") .help("Comma-separated list of style elements to display.")
.long_help( .long_help(
"Configure which elements (line numbers, file headers, grid \ "Configure which elements (line numbers, file headers, grid \
borders, Git modifications, ..) to display in addition to the \ borders, Git modifications, ..) to display in addition to the \
file contents. The argument is a comma-separated list of \ file contents. The argument is a comma-separated list of \
components to display (e.g. 'numbers,changes,grid') or a \ components to display (e.g. 'numbers,changes,grid') or a \
pre-defined style ('full')", pre-defined style ('full')",
), ),
).arg( ).arg(
Arg::with_name("plain") Arg::with_name("plain")
.overrides_with("plain") .overrides_with("plain")
.short("p") .short("p")
.long("plain") .long("plain")
.conflicts_with("style") .conflicts_with("style")
.conflicts_with("number") .conflicts_with("number")
.help("Show plain style (alias for '--style=plain').") .help("Show plain style (alias for '--style=plain').")
.long_help( .long_help(
"Only show plain style, no decorations. This is an alias for \ "Only show plain style, no decorations. This is an alias for \
'--style=plain'", '--style=plain'",
), ),
).arg( ).arg(
Arg::with_name("number") Arg::with_name("number")
.long("number") .long("number")
.overrides_with("number") .overrides_with("number")
.short("n") .short("n")
.conflicts_with("style") .conflicts_with("style")
.help("Show line numbers (alias for '--style=numbers').") .help("Show line numbers (alias for '--style=numbers').")
.long_help( .long_help(
"Only show line numbers, no other decorations. This is an alias for \ "Only show line numbers, no other decorations. This is an alias for \
'--style=numbers'", '--style=numbers'",
), ),
).arg( ).arg(
Arg::with_name("line-range") Arg::with_name("line-range")
.long("line-range") .long("line-range")
.overrides_with("line-range") .overrides_with("line-range")
.takes_value(true) .takes_value(true)
.value_name("N:M") .value_name("N:M")
.help("Only print the lines from N to M.") .help("Only print the lines from N to M.")
.long_help( .long_help(
"Only print the specified range of lines for each file. \ "Only print the specified range of lines for each file. \
For example:\n \ For example:\n \
'--line-range 30:40' prints lines 30 to 40\n \ '--line-range 30:40' prints lines 30 to 40\n \
'--line-range :40' prints lines 1 to 40\n \ '--line-range :40' prints lines 1 to 40\n \
'--line-range 40:' prints lines 40 to the end of the file", '--line-range 40:' prints lines 40 to the end of the file",
), ),
).arg( ).arg(
Arg::with_name("color") Arg::with_name("color")
.long("color") .long("color")
.overrides_with("color") .overrides_with("color")
.takes_value(true) .takes_value(true)
.value_name("when") .value_name("when")
.possible_values(&["auto", "never", "always"]) .possible_values(&["auto", "never", "always"])
.default_value("auto") .default_value("auto")
.help("When to use colors.") .help("When to use colors.")
.long_help("Specify when to use colored output. The automatic mode \ .long_help("Specify when to use colored output. The automatic mode \
only enables colors if an interactive terminal is detected."), only enables colors if an interactive terminal is detected."),
).arg( ).arg(
Arg::with_name("decorations") Arg::with_name("decorations")
.long("decorations") .long("decorations")
.overrides_with("decorations") .overrides_with("decorations")
.takes_value(true) .takes_value(true)
.value_name("when") .value_name("when")
.possible_values(&["auto", "never", "always"]) .possible_values(&["auto", "never", "always"])
.default_value("auto") .default_value("auto")
.help("When to show the decorations specified by '--style'.") .help("When to show the decorations specified by '--style'.")
.long_help("Specify when to use the decorations that have been specified \ .long_help("Specify when to use the decorations that have been specified \
via '--style'. The automatic mode only enables decorations if \ via '--style'. The automatic mode only enables decorations if \
an interactive terminal is detected."), an interactive terminal is detected."),
).arg( ).arg(
Arg::with_name("paging") Arg::with_name("paging")
.long("paging") .long("paging")
.overrides_with("paging") .overrides_with("paging")
.takes_value(true) .takes_value(true)
.value_name("when") .value_name("when")
.possible_values(&["auto", "never", "always"]) .possible_values(&["auto", "never", "always"])
.default_value("auto") .default_value("auto")
.help("Specify when to use the pager.") .help("Specify when to use the pager.")
.long_help("Specify when to use the pager. To control which pager \ .long_help("Specify when to use the pager. To control which pager \
is used, set the PAGER or BAT_PAGER environment \ is used, set the PAGER or BAT_PAGER environment \
variables (the latter takes precedence). The default \ variables (the latter takes precedence). The default \
pager is 'less'. To disable the pager permanently, set \ pager is 'less'. To disable the pager permanently, set \
BAT_PAGER to an empty string."), BAT_PAGER to an empty string."),
).arg( ).arg(
Arg::with_name("wrap") Arg::with_name("wrap")
.long("wrap") .long("wrap")
.overrides_with("wrap") .overrides_with("wrap")
.takes_value(true) .takes_value(true)
.value_name("mode") .value_name("mode")
.possible_values(&["auto", "never", "character"]) .possible_values(&["auto", "never", "character"])
.default_value("auto") .default_value("auto")
.help("Specify the text-wrapping mode.") .help("Specify the text-wrapping mode.")
.long_help("Specify the text-wrapping mode."), .long_help("Specify the text-wrapping mode."),
).arg( ).arg(
Arg::with_name("unbuffered") Arg::with_name("unbuffered")
.short("u") .short("u")
.hidden_short_help(true) .hidden_short_help(true)
.long_help( .long_help(
"This option exists for POSIX-compliance reasons ('u' is for \ "This option exists for POSIX-compliance reasons ('u' is for \
'unbuffered'). The output is always unbuffered - this option \ 'unbuffered'). The output is always unbuffered - this option \
is simply ignored.", is simply ignored.",
), ),
).arg( ).arg(
Arg::with_name("tabs") Arg::with_name("tabs")
.long("tabs") .long("tabs")
.short("t") .short("t")
.takes_value(true) .takes_value(true)
.value_name("width") .value_name("width")
.help("Sets the tab width.") .help("Sets the tab width.")
.long_help("Sets the tab width. Use a width of 0 to pass tabs through \ .long_help("Sets the tab width. Use a width of 0 to pass tabs through \
directly"), directly"),
).arg( ).arg(
Arg::with_name("terminal-width") Arg::with_name("terminal-width")
.long("terminal-width") .long("terminal-width")
.takes_value(true) .takes_value(true)
.value_name("width") .value_name("width")
.hidden(true) .hidden(true)
.help("Set the width of the terminal"), .help("Set the width of the terminal"),
).subcommand( ).subcommand(
SubCommand::with_name("cache") SubCommand::with_name("cache")
.about("Modify the syntax-definition and theme cache") .about("Modify the syntax-definition and theme cache")
.arg( .arg(
Arg::with_name("init") Arg::with_name("init")
.long("init") .long("init")
.short("i") .short("i")
.help("Initialize the syntax/theme cache.") .help("Initialize the syntax/theme cache.")
.long_help( .long_help(
"Initialize the syntax/theme cache by loading from the \ "Initialize the syntax/theme cache by loading from the \
source directory (default: the configuration directory).", source directory (default: the configuration directory).",
), ),
).arg( ).arg(
Arg::with_name("clear") Arg::with_name("clear")
.long("clear") .long("clear")
.short("c") .short("c")
.help("Remove the cached syntax definitions and themes."), .help("Remove the cached syntax definitions and themes."),
).arg( ).arg(
Arg::with_name("config-dir") Arg::with_name("config-dir")
.long("config-dir") .long("config-dir")
.short("d") .short("d")
.help("Show bat's configuration directory."), .help("Show bat's configuration directory."),
).group( ).group(
ArgGroup::with_name("cache-actions") ArgGroup::with_name("cache-actions")
.args(&["init", "clear", "config-dir"]) .args(&["init", "clear", "config-dir"])
.required(arg_group_required), .required(arg_group_required),
).arg( ).arg(
Arg::with_name("source") Arg::with_name("source")
.long("source") .long("source")
.requires("init") .requires("init")
.takes_value(true) .takes_value(true)
.value_name("dir") .value_name("dir")
.help("Use a different directory to load syntaxes and themes from."), .help("Use a different directory to load syntaxes and themes from."),
).arg( ).arg(
Arg::with_name("target") Arg::with_name("target")
.long("target") .long("target")
.requires("init") .requires("init")
.takes_value(true) .takes_value(true)
.value_name("dir") .value_name("dir")
.help( .help(
"Use a different directory to store the cached syntax and theme set.", "Use a different directory to store the cached syntax and theme set.",
),
).arg(
Arg::with_name("blank")
.long("blank")
.requires("init")
.help("Create completely new syntax and theme sets \
(instead of appending to the default sets).")
), ),
).help_message("Print this help message.") ).arg(
Arg::with_name("blank")
.long("blank")
.requires("init")
.help("Create completely new syntax and theme sets \
(instead of appending to the default sets).")
),
).help_message("Print this help message.")
.version_message("Show version information.") .version_message("Show version information.")
.get_matches() .get_matches()
} }
@ -353,6 +353,27 @@ impl App {
let files = self.files(); let files = self.files();
let output_components = self.output_components()?; let output_components = self.output_components()?;
let paging_mode = match self.matches.value_of("paging") {
Some("always") => PagingMode::Always,
Some("never") => PagingMode::Never,
Some("auto") | _ => if files.contains(&InputFile::StdIn) {
// If we are reading from stdin, only enable paging if we write to an
// interactive terminal and if we do not *read* from an interactive
// terminal.
if self.interactive_output && !atty::is(Stream::Stdin) {
PagingMode::QuitIfOneScreen
} else {
PagingMode::Never
}
} else {
if self.interactive_output {
PagingMode::QuitIfOneScreen
} else {
PagingMode::Never
}
},
};
Ok(Config { Ok(Config {
true_color: is_truecolor_terminal(), true_color: is_truecolor_terminal(),
language: self.matches.value_of("language"), language: self.matches.value_of("language"),
@ -376,26 +397,7 @@ impl App {
Some("never") => false, Some("never") => false,
Some("auto") | _ => self.interactive_output, Some("auto") | _ => self.interactive_output,
}, },
paging_mode: match self.matches.value_of("paging") { paging_mode,
Some("always") => PagingMode::Always,
Some("never") => PagingMode::Never,
Some("auto") | _ => if files.contains(&InputFile::StdIn) {
// If we are reading from stdin, only enable paging if we write to an
// interactive terminal and if we do not *read* from an interactive
// terminal.
if self.interactive_output && !atty::is(Stream::Stdin) {
PagingMode::QuitIfOneScreen
} else {
PagingMode::Never
}
} else {
if self.interactive_output {
PagingMode::QuitIfOneScreen
} else {
PagingMode::Never
}
},
},
term_width: self term_width: self
.matches .matches
.value_of("terminal-width") .value_of("terminal-width")
@ -410,7 +412,13 @@ impl App {
.value_of("tabs") .value_of("tabs")
.and_then(|w| w.parse().ok()) .and_then(|w| w.parse().ok())
.or_else(|| env::var("BAT_TABS").ok().and_then(|w| w.parse().ok())) .or_else(|| env::var("BAT_TABS").ok().and_then(|w| w.parse().ok()))
.unwrap_or(8), .unwrap_or(
if output_components.plain() && paging_mode == PagingMode::Never {
0
} else {
8
},
),
theme: self theme: self
.matches .matches
.value_of("theme") .value_of("theme")