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

fix: continuation line on multiline labels

This commit is contained in:
beeb 2026-02-06 12:52:24 +01:00
parent df7bcfa17d
commit d696bf3316
No known key found for this signature in database
GPG Key ID: 3C74CF4793150A13
1 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/handlers/graphical.rs
View File

@ -740,7 +740,7 @@ impl GraphicalReportHandler {
max_gutter,
line,
&labels,
LabelRenderMode::SingleLine,
LabelRenderMode::MultiLineEndPending,
)?;
self.render_single_line_highlights(
f,
@ -930,7 +930,8 @@ impl GraphicalReportHandler {
let applicable = highlights.iter().filter(|hl| line.span_applies_gutter(hl));
for (i, hl) in applicable.enumerate() {
if !line.span_line_only(hl) && line.span_ends(hl) {
if render_mode == LabelRenderMode::MultiLineRest {
match render_mode {
LabelRenderMode::MultiLineRest => {
// this is to make multiline labels work. We want to make the right amount
// of horizontal space for them, but not actually draw the lines
let horizontal_space = max_gutter.saturating_sub(i) + 2;
@ -945,7 +946,15 @@ impl GraphicalReportHandler {
// · │ are the problem
// ^this
gutter_cols += horizontal_space + 1;
} else {
}
LabelRenderMode::MultiLineEndPending => {
// we're rendering continuation lines for single-line highlights on a line
// where a multiline span ends
// render │ to show the span is still visually "open" until we render its own label with ╰──
gutter.push_str(&chars.vbar.style(hl.style).to_string());
gutter_cols += 1;
}
LabelRenderMode::SingleLine | LabelRenderMode::MultiLineFirst => {
let num_repeat = max_gutter.saturating_sub(i) + 2;
gutter.push_str(&chars.lbot.style(hl.style).to_string());
@ -974,6 +983,7 @@ impl GraphicalReportHandler {
// a lot each time.
gutter_cols += num_repeat + 1;
}
}
break;
} else {
gutter.push_str(&chars.vbar.style(hl.style).to_string());
@ -1244,7 +1254,7 @@ impl GraphicalReportHandler {
max_gutter,
line,
all_highlights,
LabelRenderMode::SingleLine,
LabelRenderMode::MultiLineEndPending,
)?;
let mut curr_offset = 1usize;
for (offset_hl, vbar_offset) in vbar_offsets {
@ -1257,7 +1267,7 @@ impl GraphicalReportHandler {
curr_offset += 1;
} else {
let lines = match render_mode {
LabelRenderMode::SingleLine => format!(
LabelRenderMode::SingleLine | LabelRenderMode::MultiLineEndPending => format!(
"{}{} {}",
chars.lbot,
chars.hbar.to_string().repeat(2),
@ -1285,7 +1295,7 @@ impl GraphicalReportHandler {
render_mode: LabelRenderMode,
) -> fmt::Result {
match render_mode {
LabelRenderMode::SingleLine => {
LabelRenderMode::SingleLine | LabelRenderMode::MultiLineEndPending => {
writeln!(f, "{} {}", self.theme.characters.hbar.style(style), label)?;
}
LabelRenderMode::MultiLineFirst => {
@ -1382,6 +1392,9 @@ enum LabelRenderMode {
MultiLineFirst,
/// we're rendering the rest of a multiline label
MultiLineRest,
/// we're rendering continuation lines for single-line highlights on a line where
/// a multi-line span ends - render │ instead of ╰── for ending spans
MultiLineEndPending,
}
#[derive(Debug)]