Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Render excerpt headers using DisplayMap::insert_blocks

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-12-21 18:31:13 +01:00
parent 91c786a8db
commit eec1748dc7
5 changed files with 73 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crates/diagnostics/src/diagnostics.rs
View file

@ -105,33 +105,40 @@ impl ProjectDiagnosticsEditor {
let excerpt_start = Point::new(range.start.row.saturating_sub(1), 0);
let excerpt_end = snapshot
.clip_point(Point::new(range.end.row + 1, u32::MAX), Bias::Left);
let excerpt_id = excerpts.push_excerpt(
ExcerptProperties {
buffer: &buffer,
range: excerpt_start..excerpt_end,
},
excerpts_cx,
);
let mut excerpt = ExcerptProperties {
buffer: &buffer,
range: excerpt_start..excerpt_end,
header_height: 0,
render_header: None,
};
let header_position = (excerpt_id.clone(), language::Anchor::min());
if is_first_excerpt {
let primary = &group.entries[group.primary_ix].diagnostic;
let mut header = primary.clone();
header.message =
primary.message.split('\n').next().unwrap().to_string();
excerpt.header_height = 2;
excerpt.render_header = Some(diagnostic_header_renderer(
buffer.clone(),
header,
self.build_settings.clone(),
));
blocks.push(BlockProperties {
position: header_position,
height: 2,
render: diagnostic_header_renderer(
buffer.clone(),
header,
self.build_settings.clone(),
),
disposition: BlockDisposition::Above,
});
} else {
excerpt.header_height = 1;
excerpt.render_header =
Some(context_header_renderer(self.build_settings.clone()));
blocks.push(BlockProperties {
position: header_position,
height: 1,
render: context_header_renderer(self.build_settings.clone()),
disposition: BlockDisposition::Above,
});
}
is_first_excerpt = false;
let excerpt_id = excerpts.push_excerpt(excerpt, excerpts_cx);
for entry in &group.entries[*start_ix..ix] {
let mut diagnostic = entry.diagnostic.clone();
if diagnostic.is_primary {