mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-03-10 14:13:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix colors + fix dependency version mismatch

Browse Source
This commit is contained in:
Mark 2024-06-26 01:22:13 +02:00
parent 1182ffa10e
commit f08784af3b
3 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mers/Cargo.toml
View File

@ -15,7 +15,7 @@ default = ["colored-output"]
colored-output = ["mers_lib/ecolor-term", "dep:colored"] colored-output = ["mers_lib/ecolor-term", "dep:colored"]
[dependencies] [dependencies]
mers_lib = "0.8.14" # mers_lib = "0.8.14"
# mers_lib = { path = "../mers_lib" } mers_lib = { path = "../mers_lib" }
clap = { version = "4.3.19", features = ["derive"] } clap = { version = "4.3.19", features = ["derive"] }
colored = { version = "2.1.0", optional = true } colored = { version = "2.1.0", optional = true }

4
mers_lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "mers_lib" name = "mers_lib"
version = "0.8.14" version = "0.8.15"
edition = "2021" edition = "2021"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
description = "library to use the mers language in other projects" description = "library to use the mers language in other projects"
@ -19,5 +19,5 @@ run = []
ecolor-term = ["dep:colored"] ecolor-term = ["dep:colored"]
[dependencies] [dependencies]
colored = { version = "2.0.4", optional = true } colored = { version = "2.1.0", optional = true }
line-span = "0.1.5" line-span = "0.1.5"

90
mers_lib/src/errors/mod.rs
View File

@ -141,58 +141,64 @@ pub struct TermDefaultTheme;
impl Theme<String> for TermDefaultTheme { impl Theme<String> for TermDefaultTheme {
fn color(&self, text: &str, color: EColor, t: &mut String) { fn color(&self, text: &str, color: EColor, t: &mut String) {
use colored::{Color, Colorize}; use colored::{Color, Colorize};
t.push_str(&text.color(match color { t.push_str(
EColor::Indent(n) => match n % 6 { &text
0 => Color::Red, .color(match color {
1 => Color::Green, EColor::Indent(n) => match n % 6 {
2 => Color::Yellow, 0 => Color::Red,
3 => Color::Blue, 1 => Color::Green,
4 => Color::Magenta, 2 => Color::Yellow,
_ => Color::Cyan, 3 => Color::Blue,
}, 4 => Color::Magenta,
_ => Color::Cyan,
},
EColor::UnknownVariable => Color::Red, EColor::UnknownVariable => Color::Red,
EColor::WhitespaceAfterHashtag => Color::Red, EColor::WhitespaceAfterHashtag => Color::Red,
EColor::HashUnknown => Color::Red, EColor::HashUnknown => Color::Red,
EColor::HashIncludeCantLoadFile => Color::Red, EColor::HashIncludeCantLoadFile => Color::Red,
EColor::HashIncludeNotAString => Color::Red, EColor::HashIncludeNotAString => Color::Red,
EColor::HashIncludeErrorInIncludedFile => Color::Red, EColor::HashIncludeErrorInIncludedFile => Color::Red,
EColor::BackslashEscapeUnknown => Color::Red, EColor::BackslashEscapeUnknown => Color::Red,
EColor::BackslashEscapeEOF => Color::Red, EColor::BackslashEscapeEOF => Color::Red,
EColor::StringEOF => Color::Red, EColor::StringEOF => Color::Red,
EColor::IfConditionNotBool => Color::Red, EColor::IfConditionNotBool => Color::Red,
EColor::ChainWithNonFunction => Color::Yellow, EColor::ChainWithNonFunction => Color::Yellow,
EColor::Function => Color::BrightMagenta, EColor::Function => Color::BrightMagenta,
EColor::FunctionArgument => Color::BrightBlue, EColor::FunctionArgument => Color::BrightBlue,
EColor::InitFrom | EColor::AssignFrom | EColor::AsTypeStatementWithTooBroadType => { EColor::InitFrom
Color::BrightCyan | EColor::AssignFrom
} | EColor::AsTypeStatementWithTooBroadType => Color::BrightCyan,
EColor::InitTo | EColor::AssignTo | EColor::AsTypeTypeAnnotation => Color::Green, EColor::InitTo | EColor::AssignTo | EColor::AsTypeTypeAnnotation => {
EColor::AssignTargetNonReference => Color::BrightYellow, Color::Green
}
EColor::AssignTargetNonReference => Color::BrightYellow,
EColor::BadCharInTupleType => Color::Red, EColor::BadCharInTupleType => Color::Red,
EColor::BadCharInFunctionType => Color::Red, EColor::BadCharInFunctionType => Color::Red,
EColor::BadTypeFromParsed => Color::Blue, EColor::BadTypeFromParsed => Color::Blue,
EColor::TypeAnnotationNoClosingBracket => Color::Blue, EColor::TypeAnnotationNoClosingBracket => Color::Blue,
EColor::TryBadSyntax => Color::Red, EColor::TryBadSyntax => Color::Red,
EColor::TryNoFunctionFound => Color::Red, EColor::TryNoFunctionFound => Color::Red,
EColor::TryNotAFunction => Color::Red, EColor::TryNotAFunction => Color::Red,
EColor::TryUnusedFunction1 => Color::Red, EColor::TryUnusedFunction1 => Color::Red,
EColor::TryUnusedFunction2 => Color::BrightRed, EColor::TryUnusedFunction2 => Color::BrightRed,
EColor::CustomTypeTestFailed => Color::BrightRed, EColor::CustomTypeTestFailed => Color::BrightRed,
EColor::StacktraceDescend => Color::Yellow, EColor::StacktraceDescend => Color::Yellow,
EColor::StacktraceDescendHashInclude => Color::Red, EColor::StacktraceDescendHashInclude => Color::Red,
EColor::MaximumRuntimeExceeded => Color::BrightYellow, EColor::MaximumRuntimeExceeded => Color::BrightYellow,
EColor::InCodePositionLine => Color::BrightBlack, EColor::InCodePositionLine => Color::BrightBlack,
})); })
.to_string(),
);
} }
} }
#[derive(Clone)] #[derive(Clone)]