berkus
/
miette
mirror of https://github.com/zkat/miette.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: move detail rendering out for clarity

This commit is contained in:
Kat Marchán 2021-08-03 07:52:25 -07:00
parent 3ad7666777
commit f8cf66cd90
No known key found for this signature in database
GPG Key ID: AEB529C08A3C7E9E
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/reporter.rs
View File

@ -9,6 +9,39 @@ use crate::protocol::{Diagnostic, DiagnosticDetail, DiagnosticReporter, Severity
pub struct Reporter;
impl Reporter {
fn render_detail(
&self,
f: &mut core::fmt::Formatter<'_>,
detail: &DiagnosticDetail,
) -> core::fmt::Result {
use core::fmt::Write as _;
write!(f, "\n[{}]", detail.source_name)?;
if let Some(msg) = &detail.message {
write!(f, " {}:", msg)?;
}
writeln!(
indented(f),
"\n\n({}) @ line {}, col {} ",
detail.span.label,
detail.span.start.line + 1,
detail.span.start.column + 1
)?;
if let Some(other_spans) = &detail.other_spans {
for span in other_spans {
writeln!(
indented(f),
"\n{} @ line {}, col {} ",
span.label,
span.start.line + 1,
span.start.column + 1
)?;
}
}
Ok(())
}
}
impl DiagnosticReporter for Reporter {
fn debug(
&self,
@ -44,36 +77,8 @@ impl DiagnosticReporter for Reporter {
if let Some(details) = diagnostic.details() {
writeln!(f)?;
for DiagnosticDetail {
source_name,
message,
span,
other_spans,
..
} in details
{
write!(f, "\n[{}]", source_name)?;
if let Some(msg) = message {
write!(f, " {}:", msg)?;
}
writeln!(
indented(f),
"\n\n({}) @ line {}, col {} ",
span.label,
span.start.line + 1,
span.start.column + 1
)?;
if let Some(other_spans) = other_spans {
for span in other_spans {
writeln!(
indented(f),
"\n{} @ line {}, col {} ",
span.label,
span.start.line + 1,
span.start.column + 1
)?;
}
}
for detail in details {
self.render_detail(f, detail)?;
}
}