neuwirth
/
pmacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pmacs-gpu: diagnostic squiggles as quad bars; retire the fg recolor 

Diagnostics were rendered by overriding glyph fg color — clobbering
the syntax color of the token the diagnostic points at, the same
flaw the TUI fixed via protocol v6 underline_color. Now each
diagnostic decoration draws a 2px severity-colored bar hugging the
bottom of its glyph extents (push_glyph_extent_rects grows a bar_px
mode), same palette as before.

With no fg-affecting decoration kinds left, the fg-fingerprint
reshape gate is gone: every decoration change takes the cheap
request_redraw path (quads rebuild per frame), so diagnostic
publishes no longer pay set_rich_text + shape_until_scroll at all —
decorations drop out of the rich-chunk pipeline entirely
(projected_rich_chunks / clipped_chunks_for_range lose the param).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Levi Neuwirth 2026-06-12 10:10:00 -04:00
parent a11d9ab374
commit 81288187e0
1 changed files with 81 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
pmacs-gpu/src/main.rs
View File

@ -1626,26 +1626,20 @@ impl State {
// Same staleness translation as the StyleSpans arm. // Same staleness translation as the StyleSpans arm.
self.prune_unconfirmed_edits(generation); self.prune_unconfirmed_edits(generation);
let segments = translate_decoration_segments(segments, &self.unconfirmed_edits); let segments = translate_decoration_segments(segments, &self.unconfirmed_edits);
// Only diagnostic decorations affect the *rich text*
// (they override glyph fg in `projected_rich_chunks`);
// background kinds (Selection / CurrentLine / Search)
// are quads rebuilt cheaply in `render()`. A full
// `reshape()` (set_rich_text + shape_until_scroll) on
// every decoration change made cursor motion crawl —
// B1's own `CurrentLine` changes on every up/down move.
// Reshape only when the fg-affecting set changed; else
// just repaint the quads.
let fg_before = fg_decoration_fingerprint(&self.current_decorations);
if full { if full {
self.replace_decorations(segments); self.replace_decorations(segments);
} else { } else {
self.merge_decorations(segments); self.merge_decorations(segments);
} }
if fg_before == fg_decoration_fingerprint(&self.current_decorations) { // Every decoration kind is now a quad (backgrounds
self.window.request_redraw(); // for Selection/CurrentLine, underline bars for the
} else { // diagnostics — the fg-recolor path retired with T
self.refresh_changed_lines(); // M4.6 parity), and quads rebuild cheaply per frame
} // in `render()`. No decoration change needs a
// reshape, so none triggers one — diagnostic
// publishes no longer pay set_rich_text +
// shape_until_scroll.
self.window.request_redraw();
None None
} }
InstanceMessage::InlineAdornments { buffer_id, items } => { InstanceMessage::InlineAdornments { buffer_id, items } => {
@ -1853,7 +1847,6 @@ impl State {
let rich = clipped_chunks_for_range( let rich = clipped_chunks_for_range(
&self.current_text, &self.current_text,
&self.current_spans, &self.current_spans,
&self.current_decorations,
&self.current_adornments, &self.current_adornments,
vstart, vstart,
vend, vend,
@ -1976,7 +1969,6 @@ impl State {
clipped_chunks_for_range( clipped_chunks_for_range(
&self.current_text, &self.current_text,
&self.current_spans, &self.current_spans,
&self.current_decorations,
&self.current_adornments, &self.current_adornments,
line_start, line_start,
content_end, content_end,
@ -2581,10 +2573,21 @@ impl State {
if d.kind == DecorationKind::CurrentLine { if d.kind == DecorationKind::CurrentLine {
continue; continue;
} }
if let Some(color) = decoration_kind_to_bg_color(d.kind) let Some((lo, hi)) = clip_rebase_range(d.range.start, d.range.end, vstart, vend) else {
&& let Some((lo, hi)) = clip_rebase_range(d.range.start, d.range.end, vstart, vend) continue;
{ };
self.push_glyph_extent_rects(rects, line_offsets, lo, hi, color); if let Some(color) = decoration_kind_to_bg_color(d.kind) {
self.push_glyph_extent_rects(rects, line_offsets, lo, hi, color, None);
}
if let Some(color) = decoration_kind_to_underline_color(d.kind) {
self.push_glyph_extent_rects(
rects,
line_offsets,
lo,
hi,
color,
Some(DIAG_UNDERLINE_PX),
);
} }
} }
} }
@ -2608,7 +2611,7 @@ impl State {
if let Some(color) = decoration_kind_to_bg_color(DecorationKind::CurrentLine) { if let Some(color) = decoration_kind_to_bg_color(DecorationKind::CurrentLine) {
let (lo, hi) = source_line_range(&self.current_text, presence.cursor); let (lo, hi) = source_line_range(&self.current_text, presence.cursor);
if let Some((lo, hi)) = clip_rebase_range(lo, hi, vstart, vend) { if let Some((lo, hi)) = clip_rebase_range(lo, hi, vstart, vend) {
self.push_glyph_extent_rects(rects, line_offsets, lo, hi, color); self.push_glyph_extent_rects(rects, line_offsets, lo, hi, color, None);
} }
} }
if let Some(sel) = presence.selection if let Some(sel) = presence.selection
@ -2617,7 +2620,7 @@ impl State {
let lo = sel.anchor.min(sel.active).min(text_len); let lo = sel.anchor.min(sel.active).min(text_len);
let hi = sel.anchor.max(sel.active).min(text_len); let hi = sel.anchor.max(sel.active).min(text_len);
if let Some((lo, hi)) = clip_rebase_range(lo, hi, vstart, vend) { if let Some((lo, hi)) = clip_rebase_range(lo, hi, vstart, vend) {
self.push_glyph_extent_rects(rects, line_offsets, lo, hi, color); self.push_glyph_extent_rects(rects, line_offsets, lo, hi, color, None);
} }
} }
} }
@ -2700,6 +2703,7 @@ impl State {
lo: u64, lo: u64,
hi: u64, hi: u64,
color: [f32; 4], color: [f32; 4],
bar_px: Option<f32>,
) { ) {
if hi <= lo { if hi <= lo {
return; return;
@ -2722,11 +2726,18 @@ impl State {
if let (Some(x0), Some(x1)) = (min_x, max_x) if let (Some(x0), Some(x1)) = (min_x, max_x)
&& x1 > x0 && x1 > x0
{ {
// `bar_px`: an underline bar hugging the bottom of the
// line box instead of a full-height wash — the GPU's
// diagnostic squiggle (T M4.6 parity, straight-bar v1).
let (y, h) = match bar_px {
Some(bar) => (TEXT_TOP + run.line_top + run.line_height - bar, bar),
None => (TEXT_TOP + run.line_top, run.line_height),
};
rects.push(MinimapRect { rects.push(MinimapRect {
x: TEXT_LEFT + x0, x: TEXT_LEFT + x0,
y: TEXT_TOP + run.line_top, y,
w: x1 - x0, w: x1 - x0,
h: run.line_height, h,
color, color,
}); });
} }
@ -3792,7 +3803,6 @@ fn line_from_chunks(chunks: &[RichChunk]) -> glyphon::cosmic_text::BufferLine {
fn clipped_chunks_for_range( fn clipped_chunks_for_range(
text: &str, text: &str,
spans: &[StyleSpan], spans: &[StyleSpan],
decorations: &[Decoration],
adornments: &[InlineAdornment], adornments: &[InlineAdornment],
start: u64, start: u64,
end: u64, end: u64,
@ -3807,15 +3817,6 @@ fn clipped_chunks_for_range(
}) })
}) })
.collect(); .collect();
let decorations: Vec<Decoration> = decorations
.iter()
.filter_map(|d| {
clip_rebase_range(d.range.start, d.range.end, start, end).map(|(s, e)| Decoration {
range: ByteRange { start: s, end: e },
kind: d.kind,
})
})
.collect();
let adornments: Vec<InlineAdornment> = adornments let adornments: Vec<InlineAdornment> = adornments
.iter() .iter()
.filter(|a| a.at >= start && a.at <= end) .filter(|a| a.at >= start && a.at <= end)
@ -3825,13 +3826,12 @@ fn clipped_chunks_for_range(
a a
}) })
.collect(); .collect();
projected_rich_chunks(range_text, &spans, &decorations, &adornments) projected_rich_chunks(range_text, &spans, &adornments)
} }
fn projected_rich_chunks( fn projected_rich_chunks(
text: &str, text: &str,
spans: &[StyleSpan], spans: &[StyleSpan],
decorations: &[Decoration],
adornments: &[InlineAdornment], adornments: &[InlineAdornment],
) -> Vec<RichChunk> { ) -> Vec<RichChunk> {
let text_len = text.len() as u64; let text_len = text.len() as u64;
@ -3848,10 +3848,6 @@ fn projected_rich_chunks(
boundaries.push(snap(sp.range.start)); boundaries.push(snap(sp.range.start));
boundaries.push(snap(sp.range.end)); boundaries.push(snap(sp.range.end));
} }
for d in decorations {
boundaries.push(snap(d.range.start));
boundaries.push(snap(d.range.end));
}
let mut renderable_adornments: Vec<(usize, u64, &InlineAdornment)> = adornments let mut renderable_adornments: Vec<(usize, u64, &InlineAdornment)> = adornments
.iter() .iter()
.enumerate() .enumerate()
@ -3872,7 +3868,7 @@ fn projected_rich_chunks(
if a < b { if a < b {
chunks.push(RichChunk { chunks.push(RichChunk {
text: text[a as usize..b as usize].to_owned(), text: text[a as usize..b as usize].to_owned(),
color: source_color_at(a, spans, decorations), color: source_color_at(a, spans),
source: ChunkSource::Source { start: a }, source: ChunkSource::Source { start: a },
}); });
} }
@ -3930,19 +3926,7 @@ fn adornment_text_color(fg: CellColor) -> glyphon::Color {
cell_color_to_glyphon(fg).unwrap_or_else(|| glyphon::Color::rgb(130, 130, 140)) cell_color_to_glyphon(fg).unwrap_or_else(|| glyphon::Color::rgb(130, 130, 140))
} }
fn source_color_at( fn source_color_at(byte: u64, spans: &[StyleSpan]) -> Option<glyphon::Color> {
byte: u64,
spans: &[StyleSpan],
decorations: &[Decoration],
) -> Option<glyphon::Color> {
for d in decorations {
if d.range.start <= byte
&& byte < d.range.end
&& let Some(c) = decoration_kind_to_color(d.kind)
{
return Some(c);
}
}
for sp in spans { for sp in spans {
if sp.range.start <= byte && byte < sp.range.end { if sp.range.start <= byte && byte < sp.range.end {
return cell_color_to_glyphon(sp.style.fg); return cell_color_to_glyphon(sp.style.fg);
@ -4010,46 +3994,34 @@ fn indexed_to_glyphon(idx: u8) -> glyphon::Color {
glyphon::Color::rgb(level, level, level) glyphon::Color::rgb(level, level, level)
} }
/// The decorations that affect the *rich text* (a glyph fg override in /// Height of the diagnostic underline bar, in pixels. Straight-bar
/// `projected_rich_chunks`), as an ordered `(range, kind)` set. Only /// v1; a wavy squiggle needs shader/texture work and waits until the
/// kinds with a foreground color qualify — i.e. the diagnostic /// straight bar is proven (framing Q#D1).
/// severities; background kinds (`Selection` / `CurrentLine` / search) const DIAG_UNDERLINE_PX: f32 = 2.0;
/// are quads. Equal fingerprints across a `Decorations` update mean the
/// shaped text is unaffected and a `reshape()` can be skipped (the perf
/// fix for cursor-motion-driven `CurrentLine` churn).
fn fg_decoration_fingerprint(decos: &[Decoration]) -> Vec<(ByteRange, DecorationKind)> {
decos
.iter()
.filter(|d| decoration_kind_to_color(d.kind).is_some())
.map(|d| (d.range, d.kind))
.collect()
}
/// Map a [`DecorationKind`] to a foreground color override, or `None` /// Map a [`DecorationKind`] to an underline-bar color, or `None` for
/// for kinds whose visual is a background and can't be expressed in /// kinds that don't underline.
/// the current `Attrs`-only rendering pipeline.
/// ///
/// Session 5 ships **fg-only** decoration rendering. The four /// Session 5 originally rendered diagnostics by *recoloring the text
/// background-needing kinds (`Selection`, `SearchMatch`, /// foreground*, which clobbered the syntax color of the very token
/// `SearchMatchActive`, `CurrentLine`) return `None` here because the /// the diagnostic points at — the same flaw the TUI fixed with
/// glyph-color path can only render foregrounds; they route through /// protocol v6's `underline_color` (T M4.6). The GPU's equivalent is
/// [`decoration_kind_to_bg_color`] and the quad pipeline instead. /// a [`DIAG_UNDERLINE_PX`]-tall quad hugging the bottom of the glyph
/// /// extent; the text keeps its syntax color. Same RGB palette the fg
/// Color choices match the conventional editor palette (red errors, /// path used (red / yellow / light blue / dim gray), so the window's
/// yellow warnings, light blue info, dim hints) so the GPU window's /// severity language is unchanged.
/// visual matches what the pmacs TUI paints via terminal color codes. fn decoration_kind_to_underline_color(kind: DecorationKind) -> Option<[f32; 4]> {
fn decoration_kind_to_color(kind: DecorationKind) -> Option<glyphon::Color> {
match kind { match kind {
// ANSI bright red — matches TUI diagnostic-error palette. // ANSI bright red — matches TUI diagnostic-error palette.
DecorationKind::DiagnosticError => Some(glyphon::Color::rgb(241, 76, 76)), DecorationKind::DiagnosticError => Some([0.945, 0.298, 0.298, 1.0]),
// ANSI bright yellow. // ANSI bright yellow.
DecorationKind::DiagnosticWarning => Some(glyphon::Color::rgb(245, 245, 67)), DecorationKind::DiagnosticWarning => Some([0.961, 0.961, 0.263, 1.0]),
// ANSI bright blue. // ANSI bright blue.
DecorationKind::DiagnosticInfo => Some(glyphon::Color::rgb(59, 142, 234)), DecorationKind::DiagnosticInfo => Some([0.231, 0.557, 0.918, 1.0]),
// ANSI bright black (dim gray — hints should be visible but // ANSI bright black (dim gray — hints should be visible but
// visually quietest of the diagnostic four). // visually quietest of the diagnostic four).
DecorationKind::DiagnosticHint => Some(glyphon::Color::rgb(102, 102, 102)), DecorationKind::DiagnosticHint => Some([0.4, 0.4, 0.4, 1.0]),
// Background-needing kinds route through the quad pipeline. // Background kinds wash the full line box instead.
DecorationKind::Selection DecorationKind::Selection
| DecorationKind::SearchMatch | DecorationKind::SearchMatch
| DecorationKind::SearchMatchActive | DecorationKind::SearchMatchActive
@ -4057,9 +4029,10 @@ fn decoration_kind_to_color(kind: DecorationKind) -> Option<glyphon::Color> {
} }
} }
/// Background-bearing companion to [`decoration_kind_to_color`]: maps /// Background-bearing companion to
/// each background-needing `DecorationKind` to its quad-pipeline color /// [`decoration_kind_to_underline_color`]: maps each
/// as an RGBA tuple in 0..=1 space. Returns `None` for foreground-only /// background-needing `DecorationKind` to its quad-pipeline color as
/// an RGBA tuple in 0..=1 space. Returns `None` for underline-only
/// kinds (the four diagnostic severities) so the two helpers form a /// kinds (the four diagnostic severities) so the two helpers form a
/// total cover with no overlap. /// total cover with no overlap.
/// ///
@ -4085,7 +4058,8 @@ fn decoration_kind_to_bg_color(kind: DecorationKind) -> Option<[f32; 4]> {
DecorationKind::CurrentLine => Some([0.55, 0.60, 0.75, 0.22]), DecorationKind::CurrentLine => Some([0.55, 0.60, 0.75, 0.22]),
// Deferred to the search-feature arc. // Deferred to the search-feature arc.
DecorationKind::SearchMatch | DecorationKind::SearchMatchActive => None, DecorationKind::SearchMatch | DecorationKind::SearchMatchActive => None,
// Foreground-only — handled by [`decoration_kind_to_color`]. // Underline-only — handled by
// [`decoration_kind_to_underline_color`].
DecorationKind::DiagnosticError DecorationKind::DiagnosticError
| DecorationKind::DiagnosticWarning | DecorationKind::DiagnosticWarning
| DecorationKind::DiagnosticInfo | DecorationKind::DiagnosticInfo
@ -4256,40 +4230,6 @@ mod tests {
assert!(!m.contains(Modifiers::SHIFT)); assert!(!m.contains(Modifiers::SHIFT));
} }
#[test]
fn fg_fingerprint_ignores_background_decoration_changes() {
let deco = |start, end, kind| Decoration {
range: ByteRange { start, end },
kind,
};
// A diagnostic (fg) decoration + a CurrentLine (bg) decoration.
let before = vec![
deco(10, 14, DecorationKind::DiagnosticError),
deco(0, 20, DecorationKind::CurrentLine),
];
// The cursor moved: CurrentLine now spans a different line, the
// diagnostic is unchanged.
let after = vec![
deco(10, 14, DecorationKind::DiagnosticError),
deco(40, 60, DecorationKind::CurrentLine),
];
assert_eq!(
fg_decoration_fingerprint(&before),
fg_decoration_fingerprint(&after),
"a CurrentLine-only change must not change the fg fingerprint (no reshape)"
);
// A diagnostic change DOES alter the fingerprint (reshape needed).
let after_diag = vec![
deco(10, 18, DecorationKind::DiagnosticError),
deco(0, 20, DecorationKind::CurrentLine),
];
assert_ne!(
fg_decoration_fingerprint(&before),
fg_decoration_fingerprint(&after_diag)
);
}
#[test] #[test]
fn line_byte_offsets_indexes_each_logical_line() { fn line_byte_offsets_indexes_each_logical_line() {
// "abc\nde\nfgh": lines start at bytes 0, 4, 7. Indexed by // "abc\nde\nfgh": lines start at bytes 0, 4, 7. Indexed by
@ -4518,10 +4458,6 @@ mod tests {
..CellStyle::default() ..CellStyle::default()
}, },
}]; }];
let decorations = vec![Decoration {
range: ByteRange { start: 0, end: 5 },
kind: DecorationKind::DiagnosticWarning,
}];
let hint = |at: u64, label: &str| InlineAdornment { let hint = |at: u64, label: &str| InlineAdornment {
at, at,
placement: AdornmentPlacement::AtOffset, placement: AdornmentPlacement::AtOffset,
@ -4535,7 +4471,6 @@ mod tests {
let full = flat(&clipped_chunks_for_range( let full = flat(&clipped_chunks_for_range(
text, text,
&spans, &spans,
&decorations,
&adornments, &adornments,
0, 0,
text.len() as u64, text.len() as u64,
@ -4549,7 +4484,6 @@ mod tests {
per_line.extend(flat(&clipped_chunks_for_range( per_line.extend(flat(&clipped_chunks_for_range(
text, text,
&spans, &spans,
&decorations,
&adornments, &adornments,
start, start,
content_end, content_end,
@ -4564,12 +4498,12 @@ mod tests {
// The boundary hint landed on line 0 (before its newline), not // The boundary hint landed on line 0 (before its newline), not
// line 1. // line 1.
let line0 = clipped_chunks_for_range(text, &spans, &decorations, &adornments, 0, 10); let line0 = clipped_chunks_for_range(text, &spans, &adornments, 0, 10);
assert!( assert!(
line0.iter().any(|c| c.text == "<eol>"), line0.iter().any(|c| c.text == "<eol>"),
"newline-anchored hint belongs to the line it terminates" "newline-anchored hint belongs to the line it terminates"
); );
let line1 = clipped_chunks_for_range(text, &spans, &decorations, &adornments, 11, 22); let line1 = clipped_chunks_for_range(text, &spans, &adornments, 11, 22);
assert!( assert!(
line1.iter().all(|c| c.text != "<eol>"), line1.iter().all(|c| c.text != "<eol>"),
"newline-anchored hint must not duplicate onto the next line" "newline-anchored hint must not duplicate onto the next line"
@ -4784,7 +4718,8 @@ mod tests {
assert!(decoration_kind_to_bg_color(DecorationKind::SearchMatch).is_none()); assert!(decoration_kind_to_bg_color(DecorationKind::SearchMatch).is_none());
assert!(decoration_kind_to_bg_color(DecorationKind::SearchMatchActive).is_none()); assert!(decoration_kind_to_bg_color(DecorationKind::SearchMatchActive).is_none());
// Foreground-only kinds belong to the fg helper. // Underline-only kinds belong to the underline helper (T M4.6
// parity: squiggle bars, not text recoloring).
for kind in [ for kind in [
DecorationKind::DiagnosticError, DecorationKind::DiagnosticError,
DecorationKind::DiagnosticWarning, DecorationKind::DiagnosticWarning,
@ -4792,12 +4727,12 @@ mod tests {
DecorationKind::DiagnosticHint, DecorationKind::DiagnosticHint,
] { ] {
assert!(decoration_kind_to_bg_color(kind).is_none()); assert!(decoration_kind_to_bg_color(kind).is_none());
assert!(decoration_kind_to_color(kind).is_some()); assert!(decoration_kind_to_underline_color(kind).is_some());
} }
} }
#[test] #[test]
fn fg_and_bg_helpers_are_disjoint_total_cover() { fn underline_and_bg_helpers_are_disjoint_total_cover() {
// Every DecorationKind is renderable by exactly one helper. // Every DecorationKind is renderable by exactly one helper.
// Adding a new kind without updating one of the helpers should // Adding a new kind without updating one of the helpers should
// fail this assertion. // fail this assertion.
@ -4811,19 +4746,18 @@ mod tests {
DecorationKind::DiagnosticInfo, DecorationKind::DiagnosticInfo,
DecorationKind::DiagnosticHint, DecorationKind::DiagnosticHint,
] { ] {
let fg = decoration_kind_to_color(kind).is_some(); let ul = decoration_kind_to_underline_color(kind).is_some();
let bg = decoration_kind_to_bg_color(kind).is_some(); let bg = decoration_kind_to_bg_color(kind).is_some();
// Background helper returns None for the search pair — // Both helpers return None for the search pair — deferred
// deferred to the search-feature arc. For both of those, // to the search-feature arc. That is the "neither yet"
// decoration_kind_to_color is also None. That is the // state — the exclusive-or test exempts it.
// "neither yet" state — the exclusive-or test exempts it.
let deferred = matches!( let deferred = matches!(
kind, kind,
DecorationKind::SearchMatch | DecorationKind::SearchMatchActive DecorationKind::SearchMatch | DecorationKind::SearchMatchActive
); );
assert!( assert!(
deferred || (fg ^ bg), deferred || (ul ^ bg),
"{kind:?}: fg={fg} bg={bg} — should be exactly one (unless deferred)" "{kind:?}: underline={ul} bg={bg} — should be exactly one (unless deferred)"
); );
} }
} }
@ -4837,11 +4771,10 @@ mod tests {
let text = "ab→cd"; let text = "ab→cd";
let chunks = projected_rich_chunks( let chunks = projected_rich_chunks(
text, text,
&[span(0, 3, CellColor::Indexed(1))], &[
&[Decoration { span(0, 3, CellColor::Indexed(1)),
range: ByteRange { start: 4, end: 9 }, span(4, 9, CellColor::Indexed(2)),
kind: DecorationKind::DiagnosticError, ],
}],
&[], &[],
); );
let rendered: String = chunks.iter().map(|chunk| chunk.text.as_str()).collect(); let rendered: String = chunks.iter().map(|chunk| chunk.text.as_str()).collect();
@ -4878,7 +4811,6 @@ mod tests {
let chunks = projected_rich_chunks( let chunks = projected_rich_chunks(
"abcd", "abcd",
&[], &[],
&[],
&[adornment(2, AdornmentPlacement::AtOffset, "X")], &[adornment(2, AdornmentPlacement::AtOffset, "X")],
); );
@ -4892,7 +4824,6 @@ mod tests {
let chunks = projected_rich_chunks( let chunks = projected_rich_chunks(
"abcd", "abcd",
&[span(2, 4, CellColor::Indexed(1))], &[span(2, 4, CellColor::Indexed(1))],
&[],
&[adornment(2, AdornmentPlacement::AtOffset, "X")], &[adornment(2, AdornmentPlacement::AtOffset, "X")],
); );
@ -4908,36 +4839,11 @@ mod tests {
); );
} }
#[test]
fn inline_adornment_does_not_shift_source_decoration_ranges() {
let chunks = projected_rich_chunks(
"abcd",
&[],
&[Decoration {
range: ByteRange { start: 2, end: 4 },
kind: DecorationKind::DiagnosticError,
}],
&[adornment(2, AdornmentPlacement::AtOffset, "X")],
);
assert_eq!(chunk_texts(&chunks), vec!["ab", "X", "cd"]);
assert!(chunks[0].color.is_none());
assert!(
chunks[1].color.is_some(),
"default-styled virtual text should render as muted adornment text"
);
assert!(
chunks[2].color.is_some(),
"diagnostic fg override must still begin at source byte 2"
);
}
#[test] #[test]
fn unsupported_adornment_placements_are_ignored_for_session_6() { fn unsupported_adornment_placements_are_ignored_for_session_6() {
let chunks = projected_rich_chunks( let chunks = projected_rich_chunks(
"abcd", "abcd",
&[], &[],
&[],
&[ &[
adornment(0, AdornmentPlacement::BeforeLine, "before"), adornment(0, AdornmentPlacement::BeforeLine, "before"),
adornment(4, AdornmentPlacement::EndOfLine, "end"), adornment(4, AdornmentPlacement::EndOfLine, "end"),
@ -4953,7 +4859,6 @@ mod tests {
let chunks = projected_rich_chunks( let chunks = projected_rich_chunks(
"abcd", "abcd",
&[], &[],
&[],
&[adornment(99, AdornmentPlacement::AtOffset, "X")], &[adornment(99, AdornmentPlacement::AtOffset, "X")],
); );