refactor: factorize constants by inverting loop and condition order

sharkdp · Apr 19, 2024 · bb4d1cb · bb4d1cb
1 parent 23ec433
commit bb4d1cb
Showing 1 changed file with 12 additions and 16 deletions.
diff --git 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(())