mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-07 21:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

ui: add helper function that sets up FormatterFactory

Browse source 
I'm going to split FormatterFactory::prepare() which takes 3 bool arguments,
and prepare() will be inlined there.
This commit is contained in:
Yuya Nishihara 2024-05-11 21:30:30 +09:00
parent d0a29a831d
commit 0423e3e1ee
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cli/src/ui.rs
View file

@ -231,6 +231,19 @@ fn use_color(choice: ColorChoice) -> bool {
} }
} }
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);
// 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();
FormatterFactory::prepare(config, debug, color, sanitize)
}
fn be_quiet(config: &config::Config) -> bool { fn be_quiet(config: &config::Config) -> bool {
config.get_bool("ui.quiet").unwrap_or_default() config.get_bool("ui.quiet").unwrap_or_default()
} }
@ -258,13 +271,9 @@ fn pager_setting(config: &config::Config) -> Result<CommandNameAndArgs, CommandE
impl Ui { impl Ui {
pub fn with_config(config: &config::Config) -> Result<Ui, CommandError> { pub fn with_config(config: &config::Config) -> Result<Ui, CommandError> {
let color = color_setting(config); let color = color_setting(config);
let debug = debug_color(color);
let color = use_color(color); let color = use_color(color);
let quiet = be_quiet(config); let quiet = be_quiet(config);
// Sanitize ANSI escape codes if we're printing to a terminal. Doesn't affect let formatter_factory = prepare_formatter_factory(config, &io::stdout())?;
// ANSI escape codes that originate from the formatter itself.
let sanitize = io::stdout().is_terminal();
let formatter_factory = FormatterFactory::prepare(config, debug, color, sanitize)?;
let progress_indicator = progress_indicator_setting(config); let progress_indicator = progress_indicator_setting(config);
Ok(Ui { Ok(Ui {
color, color,
@ -279,14 +288,12 @@ impl Ui {
pub fn reset(&mut self, config: &config::Config) -> Result<(), CommandError> { pub fn reset(&mut self, config: &config::Config) -> Result<(), CommandError> {
let color = color_setting(config); let color = color_setting(config);
let debug = debug_color(color);
self.color = use_color(color); self.color = use_color(color);
self.quiet = be_quiet(config); self.quiet = be_quiet(config);
self.paginate = pagination_setting(config)?; self.paginate = pagination_setting(config)?;
self.pager_cmd = pager_setting(config)?; self.pager_cmd = pager_setting(config)?;
self.progress_indicator = progress_indicator_setting(config); self.progress_indicator = progress_indicator_setting(config);
let sanitize = io::stdout().is_terminal(); self.formatter_factory = prepare_formatter_factory(config, &io::stdout())?;
self.formatter_factory = FormatterFactory::prepare(config, debug, self.color, sanitize)?;
Ok(()) Ok(())
} }