Fix forced colors with cargo run

canac · Jun 19, 2024 · 79b91e9 · 79b91e9
1 parent 344fd28
commit 79b91e9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -79,7 +79,7 @@ fn create_formatter(cli: &Cli) -> MessageFormatter {
     } else if cli.no_color {
         false
     } else {
-        colored::control::SHOULD_COLORIZE.should_colorize()
+        colored::control::ShouldColorize::from_env().should_colorize()
     };
     let timestamp_format = cli.timestamp_format.unwrap_or({
         if tty {
@@ -209,9 +209,6 @@ async fn main() -> Result<()> {
     // Fix broken pipe panics
     sigpipe::reset();
 
-    // Let us control the coloring instead of colored
-    colored::control::set_override(true);
-
     let config = load_config()?;
     let database = config
         .as_ref()

diff --git a/cli/src/message_formatter.rs b/cli/src/message_formatter.rs
@@ -5,7 +5,7 @@ use anyhow::{anyhow, Result};
 use chrono::{Local, TimeZone, Utc};
 use chrono_humanize::HumanTime;
 use database::{Message, State};
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::Once};
 
 enum Word {
     Message,
@@ -103,6 +103,12 @@ impl MessageFormatter {
     pub fn format_message(&self, message: &Message, appendix: Option<String>) -> Result<String> {
         use colored::Colorize;
 
+        static INIT: Once = Once::new();
+        INIT.call_once(|| {
+            // Let us control the coloring instead of colored
+            colored::control::set_override(true);
+        });
+
         // Display the time differently based on the requested format
         let time = match self.timestamp_format {
             TimestampFormat::Relative => Some(

diff --git a/cli/src/truncate.rs b/cli/src/truncate.rs
@@ -191,7 +191,6 @@ mod tests {
         assert_eq!(line.to_string(), "⭐⭐…");
     }
 
-    // This test requires CLICOLOR_FORCE=1 set in .cargo/config.toml to use colors, even in CI
     #[test]
     fn test_colored() {
         let mut line = TruncatedLine::new(11);
@@ -200,7 +199,6 @@ mod tests {
         assert_eq!(line.to_string(), "hello \u{1b}[31mworld\u{1b}[0m");
     }
 
-    // This test requires CLICOLOR_FORCE=1 set in .cargo/config.toml to use colors, even in CI
     #[test]
     fn test_colored_empty_string() {
         let mut line = TruncatedLine::new(5);