git.delta.rocks / jrsonnet / refs/commits / 761e42906daa

1use clap::{Parser, ValueEnum};1use clap::{Parser, ValueEnum};
2use jrsonnet_evaluator::trace::{2use jrsonnet_evaluator::trace::{
3	AssStrokeFormat, CompactFormat, ExplainingFormat, PathResolver, TraceFormat,3	CompactFormat, ExplainingFormat, HiDocFormat, PathResolver, TraceFormat,
4};4};
55
6#[derive(PartialEq, Eq, ValueEnum, Clone)]6#[derive(PartialEq, Eq, ValueEnum, Clone)]
42				resolver,42				resolver,
43				max_trace,43				max_trace,
44			}),44			}),
45			TraceFormatName::HiDoc => Box::new(AssStrokeFormat {45			TraceFormatName::HiDoc => Box::new(HiDocFormat {
46				resolver,46				resolver,
47				max_trace,47				max_trace,
48			}),48			}),

--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -368,12 +368,12 @@
 
 #[cfg(feature = "explaining-traces")]
 #[derive(Trace)]
-pub struct AssStrokeFormat {
+pub struct HiDocFormat {
 	pub resolver: PathResolver,
 	pub max_trace: usize,
 }
 #[cfg(feature = "explaining-traces")]
-impl TraceFormat for AssStrokeFormat {
+impl TraceFormat for HiDocFormat {
 	fn write_trace(
 		&self,
 		out: &mut dyn std::fmt::Write,
@@ -420,7 +420,7 @@
 					let rendered = builder.build();
 					let ansi = source_to_ansi(&rendered);
 					if let Some(loc) = &last_location {
-						let _ = writeln!(out, "...because of {}", loc.0.source_path());
+						let _ = writeln!(out, "...at {}", loc.0.source_path());
 					}
 					let _ = write!(out, "{}", ansi.trim_end());
 				}
@@ -456,7 +456,8 @@
 					writeln!(out)?;
 					write!(out, "{flushed}")?;
 				}
-				write!(out, "{desc}")?;
+				writeln!(out)?;
+				write!(out, "   {desc}")?;
 			}
 		}