fix(stream): Correctly handle both CLICOLOR cases

rust-cli · Mar 13, 2023 · 310aa0d · 310aa0d
1 parent 102e8ac
commit 310aa0d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/anstyle-stream/Cargo.toml b/crates/anstyle-stream/Cargo.toml
@@ -34,7 +34,7 @@ anstyle = { version = "0.3.0", path = "../anstyle" }
 anstyle-parse = { version = "0.1.0", path = "../anstyle-parse" }
 anstyle-wincon = { version = "0.1.0", path = "../anstyle-wincon", optional = true }
 concolor-override = { version = "1.0.0", optional = true }
-concolor-query = { version = "0.2.0", optional = true }
+concolor-query = { version = "0.3.0", optional = true }
 is-terminal = { version = "0.4.4", optional = true }
 utf8parse = "0.2.1"
 

diff --git a/crates/anstyle-stream/src/auto.rs b/crates/anstyle-stream/src/auto.rs
@@ -30,10 +30,13 @@ where
     pub fn new(raw: S, choice: ColorChoice) -> Self {
         match choice {
             ColorChoice::Auto => {
+                let clicolor = concolor_query::clicolor();
+                let clicolor_enabled = clicolor.unwrap_or(false);
+                let clicolor_disabled = !clicolor.unwrap_or(true);
                 if raw.is_terminal()
                     && !concolor_query::no_color()
-                    && concolor_query::term_supports_color()
-                    && concolor_query::clicolor()
+                    && !clicolor_disabled
+                    && (concolor_query::term_supports_color() || clicolor_enabled)
                     || concolor_query::clicolor_force()
                 {
                     Self::always(raw)