diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fa912c7..28e56e34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - Relax syntax mapping rule restrictions to allow brace expansion #2865 (@cyqsimon) - Apply clippy fixes #2864 (@cyqsimon) - Faster startup by offloading glob matcher building to a worker thread #2868 (@cyqsimon) +- Display which theme is the default one in basic output (no colors), see #2937 (@sblondon) - Display which theme is the default one in colored output, see #2838 (@sblondon) ## Syntaxes diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs index 78202539..4528a60b 100644 --- a/src/bin/bat/main.rs +++ b/src/bin/bat/main.rs @@ -200,14 +200,14 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result< let stdout = io::stdout(); let mut stdout = stdout.lock(); - if config.colored_output { - let default_theme = HighlightingAssets::default_theme(); - for theme in assets.themes() { - let default_theme_info = if default_theme == theme { - " (default)" - } else { - "" - }; + let default_theme = HighlightingAssets::default_theme(); + for theme in assets.themes() { + let default_theme_info = if default_theme == theme { + " (default)" + } else { + "" + }; + if config.colored_output { writeln!( stdout, "Theme: {}{}\n", @@ -219,7 +219,12 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result< .run(vec![theme_preview_file()], None) .ok(); writeln!(stdout)?; + } else { + writeln!(stdout, "{theme}{default_theme_info}")?; } + } + + if config.colored_output { writeln!( stdout, "Further themes can be installed to '{}', \ @@ -228,10 +233,6 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result< https://github.com/sharkdp/bat#adding-new-themes", config_dir.join("themes").to_string_lossy() )?; - } else { - for theme in assets.themes() { - writeln!(stdout, "{theme}")?; - } } Ok(()) diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index 9de8236a..0285ac26 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -273,7 +273,7 @@ fn squeeze_limit_line_numbers() { } #[test] -fn list_themes() { +fn list_themes_with_colors() { #[cfg(target_os = "macos")] let default_theme_chunk = "Monokai Extended Light\x1B[0m (default)"; @@ -290,6 +290,23 @@ fn list_themes() { .stdout(predicate::str::contains("Output the square of a number.").normalize()); } +#[test] +fn list_themes_without_colors() { + #[cfg(target_os = "macos")] + let default_theme_chunk = "Monokai Extended Light (default)"; + + #[cfg(not(target_os = "macos"))] + let default_theme_chunk = "Monokai Extended (default)"; + + bat() + .arg("--color=never") + .arg("--list-themes") + .assert() + .success() + .stdout(predicate::str::contains("DarkNeon").normalize()) + .stdout(predicate::str::contains(default_theme_chunk).normalize()); +} + #[test] #[cfg_attr(any(not(feature = "git"), target_os = "windows"), ignore)] fn short_help() {