Merge pull request #64 from epage/anstream

fix: Improve terminal color detection

Author: epage

Cargo.lock

@@ -33,22 +33,22 @@ clap = { version = "4.1.4", features = ["derive", "wrap_help"] }
 clap-verbosity-flag = "2.0"
 log = "0.4"
 env_logger = { version = "0.10", default-features = false, features = ["color"] }
-yansi = "0.5.1"
-concolor = "0.0.11"
-concolor-clap = { version = "0.0.13", features = ["api_unstable"] }
+concolor = "0.1.1"
+concolor-clap = { version = "0.1.0", features = ["api"] }
 proc-exit = "2"
 human-panic = "1"
 anyhow = "1.0.68"
 syntect = { version = "5.0.0", default-features = false, features = ["parsing", "regex-fancy"] }
 terminal_size = "0.2.3"
 textwrap = "0.16.0"
-anstyle = "0.2.5"
+anstyle = "0.3.1"
+anstyle-stream = "0.2.2"
+is-terminal = "0.4.4"
 content_inspector = "0.2.4"
 encoding = "0.2.33"
 git-config-env = "0.1.2"
 shlex = "1.1.0"
-atty = "0.2.14"
-anstyle-syntect = "0.1.2"
+anstyle-syntect = "0.2.0"
 bincode = "1.3.3"
 serde = { version = "1.0.152", features = ["derive"] }
 flate2 = "1.0.25"

Cargo.toml

@@ -40,7 +40,7 @@ pub fn to_anstyle_color(color: syntect::highlighting::Color) -> Option<anstyle::
             // TODO: When ansi_term adds support for bright variants using codes
             // 90-97 (foreground) and 100-107 (background), we should use those
             // for values 0x08 to 0x0f and only use Fixed for 0x10 to 0xff.
-            n => anstyle::XTermColor(n).into(),
+            n => anstyle::Ansi256Color(n).into(),
         })
     } else if color.a == 1 {
         // Themes can specify the terminal's default foreground/background color

src/assets/mod.rs

@@ -11,9 +11,9 @@ pub fn blame(
     file_path: &std::path::Path,
     config: &mut Config,
     args: &crate::args::Args,
-    colored_stdout: bool,
-    _colored_stderr: bool,
 ) -> proc_exit::ExitResult {
+    let colored_stdout = anstyle_stream::AutoStream::choice(&std::io::stdout())
+        != anstyle_stream::ColorChoice::Never;
     let total_width = terminal_size::terminal_size()
         .map(|(w, _h)| w.0)
         .or_else(|| std::env::var_os("COLUMNS").and_then(|s| s.to_str()?.parse::<u16>().ok()))
@@ -470,7 +470,7 @@ fn gutter_style(theme: &syntect::highlighting::Theme) -> anstyle::Style {
         .settings
         .gutter_foreground
         .map(crate::assets::to_anstyle_color)
-        .unwrap_or_else(|| Some(anstyle::XTermColor(DEFAULT_GUTTER_COLOR).into()));
+        .unwrap_or_else(|| Some(anstyle::Ansi256Color(DEFAULT_GUTTER_COLOR).into()));
 
     anstyle::Style::new().fg_color(fg_color)
 }

src/blame.rs

@@ -16,7 +16,7 @@ pub fn dump_config(output_path: &std::path::Path, config: &mut Config) -> proc_e
 
     if output_path == std::path::Path::new("-") {
         use std::io::Write;
-        std::io::stdout()
+        anstyle_stream::stdout()
             .write_all(output.as_bytes())
             .with_code(proc_exit::Code::FAILURE)?;
     } else {