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

Only print a newline sep. when there is a header

This commit is contained in:
Marcel Müller 2022-05-06 09:05:21 +02:00
parent 66af796c99
commit 4791251b58
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/handlers/graphical.rs
View File

@ -151,7 +151,6 @@ impl GraphicalReportHandler {
diagnostic: &(dyn Diagnostic), diagnostic: &(dyn Diagnostic),
) -> fmt::Result { ) -> fmt::Result {
self.render_header(f, diagnostic)?; self.render_header(f, diagnostic)?;
writeln!(f)?;
self.render_causes(f, diagnostic)?; self.render_causes(f, diagnostic)?;
let src = diagnostic.source_code(); let src = diagnostic.source_code();
self.render_snippets(f, diagnostic, src)?; self.render_snippets(f, diagnostic, src)?;
@ -190,6 +189,7 @@ impl GraphicalReportHandler {
); );
write!(header, "{}", link)?; write!(header, "{}", link)?;
writeln!(f, "{}", header)?; writeln!(f, "{}", header)?;
writeln!(f)?;
} else if let Some(code) = diagnostic.code() { } else if let Some(code) = diagnostic.code() {
write!(header, "{}", code.style(severity_style),)?; write!(header, "{}", code.style(severity_style),)?;
if self.links == LinkStyle::Text && diagnostic.url().is_some() { if self.links == LinkStyle::Text && diagnostic.url().is_some() {
@ -197,6 +197,7 @@ impl GraphicalReportHandler {
write!(header, " ({})", url.style(self.theme.styles.link))?; write!(header, " ({})", url.style(self.theme.styles.link))?;
} }
writeln!(f, "{}", header)?; writeln!(f, "{}", header)?;
writeln!(f)?;
} }
Ok(()) Ok(())
} }
@ -301,7 +302,6 @@ impl GraphicalReportHandler {
Some(Severity::Advice) => write!(f, "Advice: ")?, Some(Severity::Advice) => write!(f, "Advice: ")?,
}; };
self.render_header(f, rel)?; self.render_header(f, rel)?;
writeln!(f)?;
self.render_causes(f, rel)?; self.render_causes(f, rel)?;
let src = rel.source_code().or(parent_src); let src = rel.source_code().or(parent_src);
self.render_snippets(f, rel, src)?; self.render_snippets(f, rel, src)?;

6
tests/graphical.rs
View File

@ -85,8 +85,7 @@ fn single_line_highlight_span_full_line() {
let out = fmt_report(err.into()); let out = fmt_report(err.into());
println!("Error: {}", out); println!("Error: {}", out);
let expected = r#" let expected = r#" × oops!
× oops!
╭─[issue:1:1] ╭─[issue:1:1]
1 │ source 1 │ source
2 │ text 2 │ text
@ -1201,8 +1200,7 @@ fn zero_length_eol_span() {
let out = fmt_report(err.into()); let out = fmt_report(err.into());
println!("Error: {}", out); println!("Error: {}", out);
let expected = r#" let expected = r#" × oops!
× oops!
╭─[issue:1:1] ╭─[issue:1:1]
1 │ this is the first line 1 │ this is the first line
2 │ this is the second line 2 │ this is the second line