From 255230207df20c8495d18fa8b0ff1cac55c78ba9 Mon Sep 17 00:00:00 2001
From: Andriamanitra <mikko77792@gmail.com>
Date: Mon, 22 Apr 2024 15:11:08 +0300
Subject: [PATCH 1/3] support NO_COLOR environment variable

---
 src/clash/test_case.rs   | 10 ++------
 src/formatter.rs         | 19 ++++++++------
 src/main.rs              | 53 ++++++++++++----------------------------
 src/outputstyle.rs       | 34 ++++++++++++++++++++++++++
 src/solution/test_run.rs | 24 +++++++++---------
 5 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/src/clash/test_case.rs b/src/clash/test_case.rs
index c3b01060..9b90b8d4 100644
--- a/src/clash/test_case.rs
+++ b/src/clash/test_case.rs
@@ -52,16 +52,10 @@ impl TestCase {
     }
 
     pub fn styled_input(&self, ostyle: &OutputStyle) -> String {
-        match ostyle.input_whitespace {
-            Some(ws_style) => show_whitespace(&self.test_in, &ostyle.input, &ws_style),
-            None => ostyle.input.paint(&self.test_in).to_string(),
-        }
+        show_whitespace(&self.test_in, &ostyle.input, &ostyle.input_whitespace)
     }
 
     pub fn styled_output(&self, ostyle: &OutputStyle) -> String {
-        match ostyle.output_whitespace {
-            Some(ws_style) => show_whitespace(&self.test_out, &ostyle.output, &ws_style),
-            None => ostyle.output.paint(&self.test_out).to_string(),
-        }
+        show_whitespace(&self.test_out, &ostyle.output, &ostyle.output_whitespace)
     }
 }
diff --git a/src/formatter.rs b/src/formatter.rs
index 4a6ce685..1bb39e12 100644
--- a/src/formatter.rs
+++ b/src/formatter.rs
@@ -227,13 +227,18 @@ fn format_remove_excessive_newlines(text: &str) -> String {
 
 /// 1. Replaces spaces with • and newlines with ⏎. Paints them with `ws_style`.
 /// 2. Paints the rest with `style`.
-pub fn show_whitespace(text: &str, style: &Style, ws_style: &Style) -> String {
-    let newl = format!("{}\n", ws_style.paint("⏎"));
-    let space = format!("{}", ws_style.paint("•"));
-    let fmt_non_ws = RE_NONWHITESPACE
-        .replace_all(text, |caps: &regex::Captures| style.paint(&caps[0]).to_string())
-        .to_string();
-    fmt_non_ws.replace('\n', &newl).replace(' ', &space)
+pub fn show_whitespace(text: &str, style: &Style, ws_style: &Option<Style>) -> String {
+    match ws_style {
+        None => style.paint(text).to_string(),
+        Some(ws_style) => {
+            let newl = format!("{}\n", ws_style.paint("⏎"));
+            let space = format!("{}", ws_style.paint("•"));
+            let fmt_non_ws = RE_NONWHITESPACE
+                .replace_all(text, |caps: &regex::Captures| style.paint(&caps[0]).to_string())
+                .to_string();
+            fmt_non_ws.replace('\n', &newl).replace(' ', &space)
+        }
+    }
 }
 
 /// Construct a new style that is the combination of `inner` and `outer` style.
diff --git a/src/main.rs b/src/main.rs
index 2bde3476..a6a9ff8f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,12 +12,6 @@ use clashlib::{solution, stub};
 use directories::ProjectDirs;
 use rand::seq::IteratorRandom;
 
-#[derive(Clone)]
-pub enum OutputStyleOption {
-    Default,
-    Plain,
-}
-
 fn command_from_argument(cmd_arg: Option<&String>) -> Result<Option<Command>> {
     let cmd = match cmd_arg {
         Some(cmd) => cmd,
@@ -48,7 +42,6 @@ fn cli() -> clap::Command {
         .subcommand(
             Command::new("show")
                 .about("Show clash")
-                .arg(arg!(--"no-color" "don't use ANSI colors in the output"))
                 .arg(
                     arg!(--"show-whitespace" [BOOL] "render ⏎ and • in place of newlines and spaces")
                         // This means show-whitespace=1 also works
@@ -96,6 +89,13 @@ fn cli() -> clap::Command {
                         .value_parser(value_parser!(u64).range(1..99))
                         .value_delimiter(',')
                 )
+                .arg(
+                    arg!(--"show-whitespace" [BOOL] "render ⏎ and • in place of newlines and spaces")
+                        // This means show-whitespace=1 also works
+                        .value_parser(clap::builder::BoolishValueParser::new())
+                        .default_value("true")
+                        .default_missing_value("true")
+                )
                 .arg(
                     arg!([PUBLIC_HANDLE] "hexadecimal handle of the clash")
                         .value_parser(value_parser!(PublicHandle))
@@ -125,7 +125,6 @@ fn cli() -> clap::Command {
         .subcommand(
             Command::new("showtests")
                 .about("Print testcases and validators of current clash")
-                .arg(arg!(--"no-color" "don't use ANSI colors in the output"))
                 .arg(
                     arg!(--"show-whitespace" [BOOL] "render ⏎ and • in place of newlines and spaces")
                         // This means show-whitespace=1 also works
@@ -285,20 +284,8 @@ impl App {
         };
         let clash = self.read_clash(&handle)?;
 
-        let mut ostyle = if args.get_flag("no-color") {
-            OutputStyle::plain()
-        } else {
-            OutputStyle::default()
-        };
-        if let Some(show_ws) = args.get_one::<bool>("show-whitespace") {
-            if *show_ws {
-                ostyle.input_whitespace = ostyle.input_whitespace.or(Some(ostyle.input));
-                ostyle.output_whitespace = ostyle.output_whitespace.or(Some(ostyle.output));
-            } else {
-                ostyle.input_whitespace = None;
-                ostyle.output_whitespace = None;
-            }
-        }
+        let show_whitespace = *args.get_one::<bool>("show-whitespace").unwrap_or(&false);
+        let ostyle = OutputStyle::from_env(show_whitespace);
 
         // --reverse flag
         if args.get_flag("reverse") {
@@ -389,11 +376,13 @@ impl App {
         let suite_run = solution::run(testcases, run_command, timeout);
 
         let ignore_failures = args.get_flag("ignore-failures");
-        let style = &OutputStyle::default();
+        let show_whitespace = *args.get_one::<bool>("show-whitespace").unwrap_or(&false);
+        let ostyle = OutputStyle::from_env(show_whitespace);
+
         let mut num_passed = 0;
 
         for test_run in suite_run {
-            test_run.print_result(style);
+            test_run.print_result(&ostyle);
 
             if test_run.is_successful() {
                 num_passed += 1;
@@ -438,20 +427,8 @@ impl App {
         let clash = self.read_clash(&handle)?;
         let all_testcases = clash.testcases();
 
-        let mut ostyle = if args.get_flag("no-color") {
-            OutputStyle::plain()
-        } else {
-            OutputStyle::default()
-        };
-        if let Some(show_ws) = args.get_one::<bool>("show-whitespace") {
-            if *show_ws {
-                ostyle.input_whitespace = ostyle.input_whitespace.or(Some(ostyle.input));
-                ostyle.output_whitespace = ostyle.output_whitespace.or(Some(ostyle.output));
-            } else {
-                ostyle.input_whitespace = None;
-                ostyle.output_whitespace = None;
-            }
-        }
+        let show_whitespace = *args.get_one::<bool>("show-whitespace").unwrap_or(&false);
+        let ostyle = OutputStyle::from_env(show_whitespace);
 
         let num_testcases = all_testcases.len();
         let testcase_indices: Vec<u64> = match args.get_many::<u64>("TESTCASE") {
diff --git a/src/outputstyle.rs b/src/outputstyle.rs
index c4aa5d54..643f2eb0 100644
--- a/src/outputstyle.rs
+++ b/src/outputstyle.rs
@@ -16,6 +16,11 @@ pub struct OutputStyle {
     pub failure: Style,
     pub error: Style,
     pub stderr: Style,
+    pub dim_color: Style,
+    pub diff_green: Style,
+    pub diff_green_whitespace: Option<Style>,
+    pub diff_red: Style,
+    pub diff_red_whitespace: Option<Style>,
 }
 
 impl OutputStyle {
@@ -36,8 +41,32 @@ impl OutputStyle {
             failure: Style::default(),
             error: Style::default(),
             stderr: Style::default(),
+            dim_color: Style::default(),
+            diff_green: Style::default(),
+            diff_green_whitespace: Some(Style::default()),
+            diff_red: Style::default(),
+            diff_red_whitespace: Some(Style::default()),
         }
     }
+    pub fn from_env(show_whitespace: bool) -> Self {
+        let mut ostyle = match std::env::var_os("NO_COLOR") {
+            Some(s) if s.is_empty() => OutputStyle::default(),
+            Some(_) => OutputStyle::plain(),
+            None => OutputStyle::default(),
+        };
+        if show_whitespace {
+            ostyle.input_whitespace = ostyle.input_whitespace.or(Some(ostyle.input));
+            ostyle.output_whitespace = ostyle.output_whitespace.or(Some(ostyle.output));
+            ostyle.diff_green_whitespace = ostyle.diff_green_whitespace.or(Some(ostyle.diff_green));
+            ostyle.diff_red_whitespace = ostyle.diff_red_whitespace.or(Some(ostyle.diff_red));
+        } else {
+            ostyle.input_whitespace = None;
+            ostyle.output_whitespace = None;
+            ostyle.diff_green_whitespace = None;
+            ostyle.diff_red_whitespace = None;
+        }
+        ostyle
+    }
 }
 
 impl Default for OutputStyle {
@@ -58,6 +87,11 @@ impl Default for OutputStyle {
             failure: Style::new().on(Color::Red),
             error: Style::new().on(Color::Red),
             stderr: Style::new().fg(Color::Red),
+            dim_color: Style::new().fg(Color::RGB(50, 50, 50)),
+            diff_green: Style::new().fg(Color::RGB(111, 255, 111)),
+            diff_green_whitespace: Some(Style::new().fg(Color::RGB(0, 70, 0))),
+            diff_red: Style::new().fg(Color::RGB(255, 111, 111)),
+            diff_red_whitespace: Some(Style::new().fg(Color::Red).on(Color::RGB(70, 0, 0))),
         }
     }
 }
diff --git a/src/solution/test_run.rs b/src/solution/test_run.rs
index b5053605..03404a6b 100644
--- a/src/solution/test_run.rs
+++ b/src/solution/test_run.rs
@@ -115,15 +115,13 @@ fn print_diff(testcase: &TestCase, stdout: &str, ostyle: &OutputStyle) {
     use itertools::EitherOrBoth::{Both, Left, Right};
     use itertools::Itertools;
 
-    // (TODO) temporary styling, to be replaced with OutputStyle eventually
-    let green = ansi_term::Style::new().fg(ansi_term::Color::RGB(111, 255, 111));
-    let red = ansi_term::Style::new().fg(ansi_term::Color::RGB(255, 111, 111));
-    let error_red = ansi_term::Style::new().fg(ansi_term::Color::Red).on(ansi_term::Color::RGB(70, 0, 0));
-    let dim_color = ansi_term::Style::new().fg(ansi_term::Color::RGB(50, 50, 50));
-    let ws_style = &ostyle.output_whitespace.unwrap_or(ostyle.output);
+    let diff_red = &ostyle.diff_red;
+    let diff_ws_red = &ostyle.diff_red_whitespace;
+    let diff_green = &ostyle.diff_green;
+    let diff_ws_green = &ostyle.diff_green_whitespace;
 
     if stdout.is_empty() {
-        println!("{}", dim_color.paint("(no output)"));
+        println!("{}", ostyle.dim_color.paint("(no output)"));
         return
     }
 
@@ -134,7 +132,7 @@ fn print_diff(testcase: &TestCase, stdout: &str, ostyle: &OutputStyle) {
     for either_or_both in expected_lines.zip_longest(actual_lines) {
         match either_or_both {
             Left(_) => missing_lines += 1,
-            Right(s) => print!("{}", show_whitespace(s, &red, &error_red)),
+            Right(s) => print!("{}", show_whitespace(s, diff_red, diff_ws_red)),
             Both(a, b) => {
                 let mut prev_deleted = false;
 
@@ -144,13 +142,13 @@ fn print_diff(testcase: &TestCase, stdout: &str, ostyle: &OutputStyle) {
                             let mut chars = text.chars();
                             let first_char = chars.next().expect("no chars???").to_string();
                             let rest = chars.as_str();
-                            print!("{}", show_whitespace(&first_char, &red, &error_red));
+                            print!("{}", show_whitespace(&first_char, diff_red, diff_ws_red));
                             if !rest.is_empty() {
-                                print!("{}", show_whitespace(rest, &green, ws_style));
+                                print!("{}", show_whitespace(rest, diff_green, diff_ws_green));
                             }
                         }
-                        Equal(text) => print!("{}", show_whitespace(text, &green, ws_style)),
-                        Insert(text) => print!("{}", show_whitespace(text, &red, &error_red)),
+                        Equal(text) => print!("{}", show_whitespace(text, diff_green, diff_ws_green)),
+                        Insert(text) => print!("{}", show_whitespace(text, diff_red, diff_ws_red)),
                         Delete(_) => {}
                     }
 
@@ -166,6 +164,6 @@ fn print_diff(testcase: &TestCase, stdout: &str, ostyle: &OutputStyle) {
 
     if missing_lines > 0 {
         let msg = format!("(expected {} more lines)", missing_lines);
-        println!("{}", dim_color.paint(msg));
+        println!("{}", ostyle.dim_color.paint(msg));
     }
 }

From 785caa84ee0e23ed95b8e9c4e866fab095a7cdca Mon Sep 17 00:00:00 2001
From: Andriamanitra <mikko77792@gmail.com>
Date: Mon, 22 Apr 2024 15:11:24 +0300
Subject: [PATCH 2/3] add .idea to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 48e8fe4c..cb967714 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /target
 .vscode
+.idea
 venv
 tmp*

From 9dfd9a6e27b868df9874858e951dfe93ede3213a Mon Sep 17 00:00:00 2001
From: Andriamanitra <mikko77792@gmail.com>
Date: Tue, 23 Apr 2024 19:52:57 +0300
Subject: [PATCH 3/3] document disabling color output

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 1efd9211..dba17480 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,14 @@ ls *.py | entr clash run --auto-advance --command "python3 sol.py"
 nodemon --ext py --exec clash -- run --auto-advance --command "python3 sol.py"
 ```
 
+### Disabling color output
+
+You may disable colors by setting the [NO_COLOR](http://no-color.org/) environment variable to any non-empty value:
+
+```console
+$ NO_COLOR=1 clash show
+```
+
 
 ## Installation