mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Maintain excerpt ordering correctly when some errors don't change

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-06 15:33:02 +01:00
parent f37f839330
commit d0f7e5f075
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,6 +219,7 @@ impl ProjectDiagnosticsEditor {
loop { loop {
let mut to_insert = None; let mut to_insert = None;
let mut to_invalidate = None; let mut to_invalidate = None;
let mut to_keep = None;
match (old_groups.peek(), new_groups.peek()) { match (old_groups.peek(), new_groups.peek()) {
(None, None) => break, (None, None) => break,
(None, Some(_)) => to_insert = new_groups.next(), (None, Some(_)) => to_insert = new_groups.next(),
@ -229,7 +230,7 @@ impl ProjectDiagnosticsEditor {
match compare_diagnostics(old_primary, new_primary, &snapshot) { match compare_diagnostics(old_primary, new_primary, &snapshot) {
Ordering::Less => to_invalidate = old_groups.next(), Ordering::Less => to_invalidate = old_groups.next(),
Ordering::Equal => { Ordering::Equal => {
old_groups.next(); to_keep = old_groups.next();
new_groups.next(); new_groups.next();
} }
Ordering::Greater => to_insert = new_groups.next(), Ordering::Greater => to_insert = new_groups.next(),
@ -337,6 +338,8 @@ impl ProjectDiagnosticsEditor {
excerpts.remove_excerpts(group_state.excerpts.iter(), excerpts_cx); excerpts.remove_excerpts(group_state.excerpts.iter(), excerpts_cx);
group_ixs_to_remove.push(group_ix); group_ixs_to_remove.push(group_ix);
blocks_to_remove.extend(group_state.blocks.keys().copied()); blocks_to_remove.extend(group_state.blocks.keys().copied());
} else if let Some((_, group)) = to_keep {
prev_excerpt_id = group.excerpts.last().unwrap().clone();
} }
} }