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

ui: forward .color() to FormatterFactory

Browse source 
This helps eliminate use_color() function.
This commit is contained in:
Yuya Nishihara 2024-05-11 21:45:34 +09:00
parent 0423e3e1ee
commit 46226a4c44
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/src/formatter.rs
View file

@ -165,6 +165,10 @@ impl FormatterFactory {
}
}
}
pub fn is_color(&self) -> bool {
matches!(self.kind, FormatterFactoryKind::Color { .. })
}
}
pub struct PlainTextFormatter<W> {

8
cli/src/ui.rs
View file

@ -162,7 +162,6 @@ impl Write for UiStderr<'_> {
}
pub struct Ui {
color: bool,
quiet: bool,
pager_cmd: CommandNameAndArgs,
paginate: PaginationChoice,
@ -270,13 +269,10 @@ fn pager_setting(config: &config::Config) -> Result<CommandNameAndArgs, CommandE
impl Ui {
pub fn with_config(config: &config::Config) -> Result<Ui, CommandError> {
let color = color_setting(config);
let color = use_color(color);
let quiet = be_quiet(config);
let formatter_factory = prepare_formatter_factory(config, &io::stdout())?;
let progress_indicator = progress_indicator_setting(config);
Ok(Ui {
color,
quiet,
formatter_factory,
pager_cmd: pager_setting(config)?,
@ -287,8 +283,6 @@ impl Ui {
}
pub fn reset(&mut self, config: &config::Config) -> Result<(), CommandError> {
let color = color_setting(config);
self.color = use_color(color);
self.quiet = be_quiet(config);
self.paginate = pagination_setting(config)?;
self.pager_cmd = pager_setting(config)?;
@ -333,7 +327,7 @@ impl Ui {
}
pub fn color(&self) -> bool {
self.color
self.formatter_factory.is_color()
}
pub fn new_formatter<'output, W: Write + 'output>(