mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

ui: inline debug_color() and use_color()

Browse source
This commit is contained in:
Yuya Nishihara 2024-05-11 21:50:47 +09:00
parent 46226a4c44
commit 46246a7734
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cli/src/ui.rs
View file

@ -217,29 +217,20 @@ fn color_setting(config: &config::Config) -> ColorChoice {
.unwrap_or_default()
}
fn debug_color(choice: ColorChoice) -> bool {
matches!(choice, ColorChoice::Debug)
}
fn use_color(choice: ColorChoice) -> bool {
match choice {
ColorChoice::Always => true,
ColorChoice::Never => false,
ColorChoice::Debug => true,
ColorChoice::Auto => io::stdout().is_terminal(),
}
}
fn prepare_formatter_factory(
config: &config::Config,
stdout: &Stdout,
) -> Result<FormatterFactory, config::ConfigError> {
let color = color_setting(config);
let debug = debug_color(color);
let color = use_color(color);
let terminal = stdout.is_terminal();
let (color, debug) = match color_setting(config) {
ColorChoice::Always => (true, false),
ColorChoice::Never => (false, false),
ColorChoice::Debug => (true, true),
ColorChoice::Auto => (terminal, false),
};
// Sanitize ANSI escape codes if we're printing to a terminal. Doesn't affect
// ANSI escape codes that originate from the formatter itself.
let sanitize = stdout.is_terminal();
let sanitize = terminal;
FormatterFactory::prepare(config, debug, color, sanitize)
}