From bb4d1cbd2ef757e0b8cf59669c3145d2538e65e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Blondon?= <stephane.blondon@gmail.com>
Date: Wed, 17 Apr 2024 11:04:56 +0200
Subject: [PATCH] refactor: factorize constants by inverting loop and condition
 order

---
 src/bin/bat/main.rs | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs
index 027f4ec4..4528a60b 100644
--- a/src/bin/bat/main.rs
+++ b/src/bin/bat/main.rs
@@ -201,13 +201,13 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<
     let mut stdout = stdout.lock();
 
     let default_theme = HighlightingAssets::default_theme();
-    if config.colored_output {
-        for theme in assets.themes() {
-            let default_theme_info = if default_theme == theme {
-                " (default)"
-            } else {
-                ""
-            };
+    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,15 +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() {
-            let default_theme_info = if default_theme == theme {
-                " (default)"
-            } else {
-                ""
-            };
-            writeln!(stdout, "{theme}{default_theme_info}")?;
-        }
     }
 
     Ok(())