refactor(stream): Clarify auto choice logic

rust-cli · Feb 27, 2024 · 69a8c69 · 69a8c69
1 parent 20dd3e0
commit 69a8c69
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/crates/anstream/src/auto.rs b/crates/anstream/src/auto.rs
@@ -190,13 +190,16 @@ fn choice(raw: &dyn RawStream) -> ColorChoice {
             let clicolor = anstyle_query::clicolor();
             let clicolor_enabled = clicolor.unwrap_or(false);
             let clicolor_disabled = !clicolor.unwrap_or(true);
-            if raw.is_terminal()
-                && !anstyle_query::no_color()
-                && !clicolor_disabled
+            if anstyle_query::clicolor_force() {
+                ColorChoice::Always
+            } else if anstyle_query::no_color() {
+                ColorChoice::Never
+            } else if clicolor_disabled {
+                ColorChoice::Never
+            } else if raw.is_terminal()
                 && (anstyle_query::term_supports_color()
                     || clicolor_enabled
                     || anstyle_query::is_ci())
-                || anstyle_query::clicolor_force()
             {
                 ColorChoice::Always
             } else {