From f08784af3b0d6e5ea450a282c8da7e51cdcf1962 Mon Sep 17 00:00:00 2001
From: Mark <>
Date: Wed, 26 Jun 2024 01:22:13 +0200
Subject: [PATCH] fix colors + fix dependency version mismatch

---
 mers/Cargo.toml            |  4 +-
 mers_lib/Cargo.toml        |  4 +-
 mers_lib/src/errors/mod.rs | 90 ++++++++++++++++++++------------------
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/mers/Cargo.toml b/mers/Cargo.toml
index 7ec808a..18f25c9 100644
--- a/mers/Cargo.toml
+++ b/mers/Cargo.toml
@@ -15,7 +15,7 @@ default = ["colored-output"]
 colored-output = ["mers_lib/ecolor-term", "dep:colored"]
 
 [dependencies]
-mers_lib = "0.8.14"
-# mers_lib = { path = "../mers_lib" }
+# mers_lib = "0.8.14"
+mers_lib = { path = "../mers_lib" }
 clap = { version = "4.3.19", features = ["derive"] }
 colored = { version = "2.1.0", optional = true }
diff --git a/mers_lib/Cargo.toml b/mers_lib/Cargo.toml
index eec507e..39199e7 100755
--- a/mers_lib/Cargo.toml
+++ b/mers_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mers_lib"
-version = "0.8.14"
+version = "0.8.15"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "library to use the mers language in other projects"
@@ -19,5 +19,5 @@ run = []
 ecolor-term = ["dep:colored"]
 
 [dependencies]
-colored = { version = "2.0.4", optional = true }
+colored = { version = "2.1.0", optional = true }
 line-span = "0.1.5"
diff --git a/mers_lib/src/errors/mod.rs b/mers_lib/src/errors/mod.rs
index 39e30f4..777d92d 100644
--- a/mers_lib/src/errors/mod.rs
+++ b/mers_lib/src/errors/mod.rs
@@ -141,58 +141,64 @@ pub struct TermDefaultTheme;
 impl Theme<String> for TermDefaultTheme {
     fn color(&self, text: &str, color: EColor, t: &mut String) {
         use colored::{Color, Colorize};
-        t.push_str(&text.color(match color {
-            EColor::Indent(n) => match n % 6 {
-                0 => Color::Red,
-                1 => Color::Green,
-                2 => Color::Yellow,
-                3 => Color::Blue,
-                4 => Color::Magenta,
-                _ => Color::Cyan,
-            },
+        t.push_str(
+            &text
+                .color(match color {
+                    EColor::Indent(n) => match n % 6 {
+                        0 => Color::Red,
+                        1 => Color::Green,
+                        2 => Color::Yellow,
+                        3 => Color::Blue,
+                        4 => Color::Magenta,
+                        _ => Color::Cyan,
+                    },
 
-            EColor::UnknownVariable => Color::Red,
+                    EColor::UnknownVariable => Color::Red,
 
-            EColor::WhitespaceAfterHashtag => Color::Red,
-            EColor::HashUnknown => Color::Red,
-            EColor::HashIncludeCantLoadFile => Color::Red,
-            EColor::HashIncludeNotAString => Color::Red,
-            EColor::HashIncludeErrorInIncludedFile => Color::Red,
+                    EColor::WhitespaceAfterHashtag => Color::Red,
+                    EColor::HashUnknown => Color::Red,
+                    EColor::HashIncludeCantLoadFile => Color::Red,
+                    EColor::HashIncludeNotAString => Color::Red,
+                    EColor::HashIncludeErrorInIncludedFile => Color::Red,
 
-            EColor::BackslashEscapeUnknown => Color::Red,
-            EColor::BackslashEscapeEOF => Color::Red,
-            EColor::StringEOF => Color::Red,
+                    EColor::BackslashEscapeUnknown => Color::Red,
+                    EColor::BackslashEscapeEOF => Color::Red,
+                    EColor::StringEOF => Color::Red,
 
-            EColor::IfConditionNotBool => Color::Red,
-            EColor::ChainWithNonFunction => Color::Yellow,
+                    EColor::IfConditionNotBool => Color::Red,
+                    EColor::ChainWithNonFunction => Color::Yellow,
 
-            EColor::Function => Color::BrightMagenta,
-            EColor::FunctionArgument => Color::BrightBlue,
+                    EColor::Function => Color::BrightMagenta,
+                    EColor::FunctionArgument => Color::BrightBlue,
 
-            EColor::InitFrom | EColor::AssignFrom | EColor::AsTypeStatementWithTooBroadType => {
-                Color::BrightCyan
-            }
-            EColor::InitTo | EColor::AssignTo | EColor::AsTypeTypeAnnotation => Color::Green,
-            EColor::AssignTargetNonReference => Color::BrightYellow,
+                    EColor::InitFrom
+                    | EColor::AssignFrom
+                    | EColor::AsTypeStatementWithTooBroadType => Color::BrightCyan,
+                    EColor::InitTo | EColor::AssignTo | EColor::AsTypeTypeAnnotation => {
+                        Color::Green
+                    }
+                    EColor::AssignTargetNonReference => Color::BrightYellow,
 
-            EColor::BadCharInTupleType => Color::Red,
-            EColor::BadCharInFunctionType => Color::Red,
-            EColor::BadTypeFromParsed => Color::Blue,
-            EColor::TypeAnnotationNoClosingBracket => Color::Blue,
+                    EColor::BadCharInTupleType => Color::Red,
+                    EColor::BadCharInFunctionType => Color::Red,
+                    EColor::BadTypeFromParsed => Color::Blue,
+                    EColor::TypeAnnotationNoClosingBracket => Color::Blue,
 
-            EColor::TryBadSyntax => Color::Red,
-            EColor::TryNoFunctionFound => Color::Red,
-            EColor::TryNotAFunction => Color::Red,
-            EColor::TryUnusedFunction1 => Color::Red,
-            EColor::TryUnusedFunction2 => Color::BrightRed,
-            EColor::CustomTypeTestFailed => Color::BrightRed,
+                    EColor::TryBadSyntax => Color::Red,
+                    EColor::TryNoFunctionFound => Color::Red,
+                    EColor::TryNotAFunction => Color::Red,
+                    EColor::TryUnusedFunction1 => Color::Red,
+                    EColor::TryUnusedFunction2 => Color::BrightRed,
+                    EColor::CustomTypeTestFailed => Color::BrightRed,
 
-            EColor::StacktraceDescend => Color::Yellow,
-            EColor::StacktraceDescendHashInclude => Color::Red,
-            EColor::MaximumRuntimeExceeded => Color::BrightYellow,
+                    EColor::StacktraceDescend => Color::Yellow,
+                    EColor::StacktraceDescendHashInclude => Color::Red,
+                    EColor::MaximumRuntimeExceeded => Color::BrightYellow,
 
-            EColor::InCodePositionLine => Color::BrightBlack,
-        }));
+                    EColor::InCodePositionLine => Color::BrightBlack,
+                })
+                .to_string(),
+        );
     }
 }
 #[derive(Clone)]