mirror of
https://github.com/Dummi26/mers.git
synced 2026-01-09 05:26:13 +01:00
improved error messages
- some small bugs are now fixed - include comments in error messages (if this causes issues, use --hide-comments) - colors should make more sense now - error-related things moved to mers_lib/src/errors/
This commit is contained in:
Mark
@@ -1,15 +1,12 @@
|
||||
use std::{
|
||||
fmt::{Debug, Display},
|
||||
fmt::Debug,
|
||||
sync::{Arc, RwLock},
|
||||
};
|
||||
|
||||
use colored::Colorize;
|
||||
use line_span::LineSpanExt;
|
||||
|
||||
use crate::{
|
||||
data::{self, Data, Type},
|
||||
errors::{CheckError, SourceRange},
|
||||
info,
|
||||
parsing::{Source, SourcePos},
|
||||
};
|
||||
|
||||
#[cfg(feature = "run")]
|
||||
@@ -61,208 +58,6 @@ pub trait MersStatement: Debug + Send + Sync {
|
||||
fn source_range(&self) -> SourceRange;
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct SourceRange {
|
||||
start: SourcePos,
|
||||
end: SourcePos,
|
||||
}
|
||||
impl From<(SourcePos, SourcePos)> for SourceRange {
|
||||
fn from(value: (SourcePos, SourcePos)) -> Self {
|
||||
SourceRange {
|
||||
start: value.0,
|
||||
end: value.1,
|
||||
}
|
||||
}
|
||||
}
|
||||
impl SourceRange {
|
||||
pub fn start(&self) -> SourcePos {
|
||||
self.start
|
||||
}
|
||||
pub fn end(&self) -> SourcePos {
|
||||
self.end
|
||||
}
|
||||
}
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct CheckError(Vec<CheckErrorComponent>);
|
||||
#[allow(non_upper_case_globals)]
|
||||
pub mod error_colors {
|
||||
use colored::Color;
|
||||
|
||||
pub const UnknownVariable: Color = Color::Red;
|
||||
|
||||
pub const WhitespaceAfterHashtag: Color = Color::Red;
|
||||
pub const HashUnknown: Color = Color::Red;
|
||||
pub const HashIncludeCantLoadFile: Color = Color::Red;
|
||||
pub const HashIncludeNotAString: Color = Color::Red;
|
||||
pub const HashIncludeErrorInIncludedFile: Color = Color::Red;
|
||||
|
||||
pub const BackslashEscapeUnknown: Color = Color::Red;
|
||||
pub const BackslashEscapeEOF: Color = Color::Red;
|
||||
pub const StringEOF: Color = Color::Red;
|
||||
|
||||
pub const IfConditionNotBool: Color = Color::Red;
|
||||
pub const ChainWithNonFunction: Color = Color::Yellow;
|
||||
|
||||
pub const Function: Color = Color::BrightMagenta;
|
||||
pub const FunctionArgument: Color = Color::BrightBlue;
|
||||
|
||||
pub const InitFrom: Color = Color::BrightCyan;
|
||||
pub const InitTo: Color = Color::Green;
|
||||
pub const AssignFrom: Color = InitFrom;
|
||||
pub const AssignTo: Color = InitTo;
|
||||
pub const AssignTargetNonReference: Color = Color::BrightYellow;
|
||||
}
|
||||
#[derive(Clone, Debug)]
|
||||
enum CheckErrorComponent {
|
||||
Message(String),
|
||||
Error(CheckError),
|
||||
Source(Vec<(SourceRange, Option<colored::Color>)>),
|
||||
}
|
||||
#[derive(Clone)]
|
||||
pub struct CheckErrorHRConfig {
|
||||
indent_start: String,
|
||||
indent_default: String,
|
||||
indent_end: String,
|
||||
}
|
||||
pub struct CheckErrorDisplay<'a> {
|
||||
e: &'a CheckError,
|
||||
src: Option<&'a Source>,
|
||||
}
|
||||
impl Display for CheckErrorDisplay<'_> {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
self.e.human_readable(
|
||||
f,
|
||||
self.src,
|
||||
&CheckErrorHRConfig {
|
||||
indent_start: String::new(),
|
||||
indent_default: String::new(),
|
||||
indent_end: String::new(),
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
impl CheckError {
|
||||
pub fn new() -> Self {
|
||||
CheckError(vec![])
|
||||
}
|
||||
fn add(mut self, v: CheckErrorComponent) -> Self {
|
||||
self.0.push(v);
|
||||
self
|
||||
}
|
||||
pub(crate) fn msg(self, s: String) -> Self {
|
||||
self.add(CheckErrorComponent::Message(s))
|
||||
}
|
||||
pub(crate) fn err(self, e: Self) -> Self {
|
||||
self.add(CheckErrorComponent::Error(e))
|
||||
}
|
||||
pub(crate) fn src(self, s: Vec<(SourceRange, Option<colored::Color>)>) -> Self {
|
||||
self.add(CheckErrorComponent::Source(s))
|
||||
}
|
||||
pub fn display<'a>(&'a self, src: &'a Source) -> CheckErrorDisplay<'a> {
|
||||
CheckErrorDisplay {
|
||||
e: self,
|
||||
src: Some(src),
|
||||
}
|
||||
}
|
||||
pub fn display_no_src<'a>(&'a self) -> CheckErrorDisplay<'a> {
|
||||
CheckErrorDisplay { e: self, src: None }
|
||||
}
|
||||
// will, unless empty, end in a newline
|
||||
fn human_readable(
|
||||
&self,
|
||||
f: &mut std::fmt::Formatter<'_>,
|
||||
src: Option<&Source>,
|
||||
cfg: &CheckErrorHRConfig,
|
||||
) -> std::fmt::Result {
|
||||
let len = self.0.len();
|
||||
for (i, component) in self.0.iter().enumerate() {
|
||||
macro_rules! indent {
|
||||
() => {
|
||||
if i + 1 == len {
|
||||
&cfg.indent_end
|
||||
} else if i == 0 {
|
||||
&cfg.indent_start
|
||||
} else {
|
||||
&cfg.indent_default
|
||||
}
|
||||
};
|
||||
}
|
||||
match component {
|
||||
CheckErrorComponent::Message(msg) => writeln!(f, "{}{msg}", indent!())?,
|
||||
CheckErrorComponent::Error(err) => {
|
||||
let mut cfg = cfg.clone();
|
||||
cfg.indent_start.push_str("│");
|
||||
cfg.indent_default.push_str("│");
|
||||
cfg.indent_end.push_str("└");
|
||||
err.human_readable(f, src, &cfg)?;
|
||||
}
|
||||
CheckErrorComponent::Source(highlights) => {
|
||||
if let Some(src) = src {
|
||||
let start = highlights.iter().map(|v| v.0.start.pos()).min();
|
||||
let end = highlights.iter().map(|v| v.0.start.pos()).max();
|
||||
if let (Some(start), Some(end)) = (start, end) {
|
||||
writeln!(f, "{}Line(s) [?] ({start}..{end})", indent!())?;
|
||||
let start = src.get_line_start(start);
|
||||
let end = src.get_line_end(end);
|
||||
let lines = src.src()[start..end].line_spans().collect::<Vec<_>>();
|
||||
for line in lines {
|
||||
let line_start = line.start();
|
||||
let line_end = line.end();
|
||||
let line = line.as_str();
|
||||
writeln!(f, "{} {line}", indent!())?;
|
||||
let mut right = 0;
|
||||
for (pos, color) in highlights {
|
||||
if let Some(color) = color {
|
||||
let highlight_start = pos.start.pos() - start;
|
||||
let highlight_end = pos.end.pos() - start;
|
||||
if highlight_start < line_end && highlight_end > line_start
|
||||
{
|
||||
// where the highlight starts in this line
|
||||
let hl_start =
|
||||
highlight_start.saturating_sub(line_start);
|
||||
// highlight would be further left than cursor, so we need a new line
|
||||
if hl_start < right {
|
||||
right = 0;
|
||||
writeln!(f)?;
|
||||
}
|
||||
// length of the highlight
|
||||
let hl_len = highlight_end
|
||||
.saturating_sub(line_start)
|
||||
.saturating_sub(hl_start);
|
||||
let hl_space = hl_start - right;
|
||||
let print_indent = right == 0;
|
||||
let hl_len = hl_len.min(line.len() - right);
|
||||
right += hl_space + hl_len;
|
||||
if print_indent && right != 0 {
|
||||
write!(f, "{} ", indent!())?;
|
||||
}
|
||||
write!(
|
||||
f,
|
||||
"{}{}",
|
||||
" ".repeat(hl_space),
|
||||
"~".repeat(hl_len).color(*color)
|
||||
)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
if right != 0 {
|
||||
writeln!(f)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
impl From<String> for CheckError {
|
||||
fn from(value: String) -> Self {
|
||||
Self::new().msg(value)
|
||||
}
|
||||
}
|
||||
|
||||
pub type Info = info::Info<Local>;
|
||||
pub type CheckInfo = info::Info<CheckLocal>;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user