mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-25 07:55:56 +00:00
Remove invalid excerpts as opposed to styling them differently
This commit is contained in:
parent
fe28abe8cf
commit
29b63ae4c6
2 changed files with 5 additions and 88 deletions
|
@ -46,7 +46,6 @@ struct DiagnosticGroupState {
|
||||||
excerpts: Vec<ExcerptId>,
|
excerpts: Vec<ExcerptId>,
|
||||||
blocks: HashMap<BlockId, DiagnosticBlock>,
|
blocks: HashMap<BlockId, DiagnosticBlock>,
|
||||||
block_count: usize,
|
block_count: usize,
|
||||||
is_valid: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
enum DiagnosticBlock {
|
enum DiagnosticBlock {
|
||||||
|
@ -207,18 +206,10 @@ impl ProjectDiagnosticsEditor {
|
||||||
let mut groups_to_add = Vec::new();
|
let mut groups_to_add = Vec::new();
|
||||||
let mut group_ixs_to_remove = Vec::new();
|
let mut group_ixs_to_remove = Vec::new();
|
||||||
let mut blocks_to_add = Vec::new();
|
let mut blocks_to_add = Vec::new();
|
||||||
let mut blocks_to_restyle = HashMap::default();
|
|
||||||
let mut blocks_to_remove = HashSet::default();
|
let mut blocks_to_remove = HashSet::default();
|
||||||
let selected_excerpts = self
|
|
||||||
.editor
|
|
||||||
.read(cx)
|
|
||||||
.local_anchor_selections()
|
|
||||||
.iter()
|
|
||||||
.flat_map(|s| [s.start.excerpt_id().clone(), s.end.excerpt_id().clone()])
|
|
||||||
.collect::<HashSet<_>>();
|
|
||||||
let mut diagnostic_blocks = Vec::new();
|
let mut diagnostic_blocks = Vec::new();
|
||||||
let excerpts_snapshot = self.excerpts.update(cx, |excerpts, excerpts_cx| {
|
let excerpts_snapshot = self.excerpts.update(cx, |excerpts, excerpts_cx| {
|
||||||
let mut old_groups = groups.iter_mut().enumerate().peekable();
|
let mut old_groups = groups.iter().enumerate().peekable();
|
||||||
let mut new_groups = snapshot
|
let mut new_groups = snapshot
|
||||||
.diagnostic_groups()
|
.diagnostic_groups()
|
||||||
.into_iter()
|
.into_iter()
|
||||||
|
@ -228,7 +219,6 @@ 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_validate = 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(),
|
||||||
|
@ -239,7 +229,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 => {
|
||||||
to_validate = old_groups.next();
|
old_groups.next();
|
||||||
new_groups.next();
|
new_groups.next();
|
||||||
}
|
}
|
||||||
Ordering::Greater => to_insert = new_groups.next(),
|
Ordering::Greater => to_insert = new_groups.next(),
|
||||||
|
@ -253,7 +243,6 @@ impl ProjectDiagnosticsEditor {
|
||||||
excerpts: Default::default(),
|
excerpts: Default::default(),
|
||||||
blocks: Default::default(),
|
blocks: Default::default(),
|
||||||
block_count: 0,
|
block_count: 0,
|
||||||
is_valid: true,
|
|
||||||
};
|
};
|
||||||
let mut pending_range: Option<(Range<Point>, usize)> = None;
|
let mut pending_range: Option<(Range<Point>, usize)> = None;
|
||||||
let mut is_first_excerpt_for_group = true;
|
let mut is_first_excerpt_for_group = true;
|
||||||
|
@ -345,76 +334,9 @@ impl ProjectDiagnosticsEditor {
|
||||||
|
|
||||||
groups_to_add.push(group_state);
|
groups_to_add.push(group_state);
|
||||||
} else if let Some((group_ix, group_state)) = to_invalidate {
|
} else if let Some((group_ix, group_state)) = to_invalidate {
|
||||||
if group_state
|
excerpts.remove_excerpts(group_state.excerpts.iter(), excerpts_cx);
|
||||||
.excerpts
|
group_ixs_to_remove.push(group_ix);
|
||||||
.iter()
|
blocks_to_remove.extend(group_state.blocks.keys().copied());
|
||||||
.any(|excerpt_id| selected_excerpts.contains(excerpt_id))
|
|
||||||
{
|
|
||||||
for (block_id, block) in &group_state.blocks {
|
|
||||||
match block {
|
|
||||||
DiagnosticBlock::Header(diagnostic) => {
|
|
||||||
blocks_to_restyle.insert(
|
|
||||||
*block_id,
|
|
||||||
diagnostic_header_renderer(
|
|
||||||
buffer.clone(),
|
|
||||||
diagnostic.clone(),
|
|
||||||
false,
|
|
||||||
self.build_settings.clone(),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
DiagnosticBlock::Inline(diagnostic) => {
|
|
||||||
blocks_to_restyle.insert(
|
|
||||||
*block_id,
|
|
||||||
diagnostic_block_renderer(
|
|
||||||
diagnostic.clone(),
|
|
||||||
false,
|
|
||||||
self.build_settings.clone(),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
DiagnosticBlock::Context => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
group_state.is_valid = false;
|
|
||||||
prev_excerpt_id = group_state.excerpts.last().unwrap().clone();
|
|
||||||
} else {
|
|
||||||
excerpts.remove_excerpts(group_state.excerpts.iter(), excerpts_cx);
|
|
||||||
group_ixs_to_remove.push(group_ix);
|
|
||||||
blocks_to_remove.extend(group_state.blocks.keys().copied());
|
|
||||||
}
|
|
||||||
} else if let Some((_, group_state)) = to_validate {
|
|
||||||
for (block_id, block) in &group_state.blocks {
|
|
||||||
match block {
|
|
||||||
DiagnosticBlock::Header(diagnostic) => {
|
|
||||||
blocks_to_restyle.insert(
|
|
||||||
*block_id,
|
|
||||||
diagnostic_header_renderer(
|
|
||||||
buffer.clone(),
|
|
||||||
diagnostic.clone(),
|
|
||||||
true,
|
|
||||||
self.build_settings.clone(),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
DiagnosticBlock::Inline(diagnostic) => {
|
|
||||||
blocks_to_restyle.insert(
|
|
||||||
*block_id,
|
|
||||||
diagnostic_block_renderer(
|
|
||||||
diagnostic.clone(),
|
|
||||||
true,
|
|
||||||
self.build_settings.clone(),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
DiagnosticBlock::Context => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
group_state.is_valid = true;
|
|
||||||
prev_excerpt_id = group_state.excerpts.last().unwrap().clone();
|
|
||||||
} else {
|
|
||||||
unreachable!();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -423,7 +345,6 @@ impl ProjectDiagnosticsEditor {
|
||||||
|
|
||||||
self.editor.update(cx, |editor, cx| {
|
self.editor.update(cx, |editor, cx| {
|
||||||
editor.remove_blocks(blocks_to_remove, cx);
|
editor.remove_blocks(blocks_to_remove, cx);
|
||||||
editor.replace_blocks(blocks_to_restyle, cx);
|
|
||||||
let mut block_ids = editor
|
let mut block_ids = editor
|
||||||
.insert_blocks(
|
.insert_blocks(
|
||||||
blocks_to_add.into_iter().map(|block| {
|
blocks_to_add.into_iter().map(|block| {
|
||||||
|
|
|
@ -3098,10 +3098,6 @@ impl Editor {
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn local_anchor_selections(&self) -> &Arc<[Selection<Anchor>]> {
|
|
||||||
&self.selections
|
|
||||||
}
|
|
||||||
|
|
||||||
fn resolve_selections<'a, D, I>(
|
fn resolve_selections<'a, D, I>(
|
||||||
&self,
|
&self,
|
||||||
selections: I,
|
selections: I,
|
||||||
|
|
Loading…
Reference in a new issue