From 89bb073b91741b3debd833a98f8218dbf0fc63f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tau=20G=C3=A4rtli?= <git@tau.garden>
Date: Tue, 16 Apr 2024 14:43:50 +0200
Subject: [PATCH] Use new `default_theme` fn for --list-themes

---
 src/bin/bat/main.rs | 10 +++++++---
 src/theme.rs        |  5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs
index 4528a60b..4dfb8124 100644
--- a/src/bin/bat/main.rs
+++ b/src/bin/bat/main.rs
@@ -30,12 +30,12 @@ use directories::PROJECT_DIRS;
 use globset::GlobMatcher;
 
 use bat::{
-    assets::HighlightingAssets,
     config::Config,
     controller::Controller,
     error::*,
     input::Input,
     style::{StyleComponent, StyleComponents},
+    theme::{color_scheme, default_theme, ColorScheme, DetectColorScheme},
     MappingTarget, PagingMode,
 };
 
@@ -200,10 +200,14 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<
     let stdout = io::stdout();
     let mut stdout = stdout.lock();
 
-    let default_theme = HighlightingAssets::default_theme();
+    let default_theme_name = default_theme(color_scheme(DetectColorScheme::Auto));
     for theme in assets.themes() {
-        let default_theme_info = if default_theme == theme {
+        let default_theme_info = if default_theme_name == theme {
             " (default)"
+        } else if default_theme(ColorScheme::Dark) == theme {
+            " (default dark)"
+        } else if default_theme(ColorScheme::Light) == theme {
+            " (default light)"
         } else {
             ""
         };
diff --git a/src/theme.rs b/src/theme.rs
index 89627049..9af8e735 100644
--- a/src/theme.rs
+++ b/src/theme.rs
@@ -19,6 +19,11 @@ pub const fn default_theme(color_scheme: ColorScheme) -> &'static str {
     }
 }
 
+/// Detects the color scheme from the terminal.
+pub fn color_scheme(when: DetectColorScheme) -> ColorScheme {
+    detect(when, &TerminalColorSchemeDetector).unwrap_or_default()
+}
+
 /// Options for configuring the theme used for syntax highlighting.
 /// Used together with [`theme`].
 #[derive(Debug, Default, PartialEq, Eq)]