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

🎨

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-10 12:14:52 +01:00
parent a1597578ff
commit eb353648e6
1 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ use gpui::{
action, elements::*, keymap::Binding, AppContext, Entity, ModelHandle, MutableAppContext, action, elements::*, keymap::Binding, AppContext, Entity, ModelHandle, MutableAppContext,
RenderContext, Task, View, ViewContext, ViewHandle, WeakViewHandle, RenderContext, Task, View, ViewContext, ViewHandle, WeakViewHandle,
}; };
use language::{Bias, Buffer, Diagnostic, DiagnosticEntry, Point, Selection, SelectionGoal}; use language::{Bias, Buffer, DiagnosticEntry, Point, Selection, SelectionGoal};
use postage::watch; use postage::watch;
use project::{Project, ProjectPath, WorktreeId}; use project::{Project, ProjectPath, WorktreeId};
use std::{cmp::Ordering, mem, ops::Range, path::Path, sync::Arc}; use std::{cmp::Ordering, mem, ops::Range, path::Path, sync::Arc};
@ -58,16 +58,10 @@ struct DiagnosticGroupState {
primary_diagnostic: DiagnosticEntry<language::Anchor>, primary_diagnostic: DiagnosticEntry<language::Anchor>,
primary_excerpt_ix: usize, primary_excerpt_ix: usize,
excerpts: Vec<ExcerptId>, excerpts: Vec<ExcerptId>,
blocks: HashMap<BlockId, DiagnosticBlock>, blocks: HashSet<BlockId>,
block_count: usize, block_count: usize,
} }
enum DiagnosticBlock {
Header(Diagnostic),
Inline(Diagnostic),
Context,
}
impl ProjectDiagnostics { impl ProjectDiagnostics {
fn new(project: ModelHandle<Project>) -> Self { fn new(project: ModelHandle<Project>) -> Self {
Self { project } Self { project }
@ -267,7 +261,6 @@ impl ProjectDiagnosticsEditor {
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_remove = HashSet::default(); let mut blocks_to_remove = HashSet::default();
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().enumerate().peekable(); let mut old_groups = groups.iter().enumerate().peekable();
let mut new_groups = snapshot let mut new_groups = snapshot
@ -346,7 +339,6 @@ impl ProjectDiagnosticsEditor {
header.message = header.message =
primary.message.split('\n').next().unwrap().to_string(); primary.message.split('\n').next().unwrap().to_string();
group_state.block_count += 1; group_state.block_count += 1;
diagnostic_blocks.push(DiagnosticBlock::Header(header.clone()));
blocks_to_add.push(BlockProperties { blocks_to_add.push(BlockProperties {
position: header_position, position: header_position,
height: 3, height: 3,
@ -360,7 +352,6 @@ impl ProjectDiagnosticsEditor {
}); });
} else { } else {
group_state.block_count += 1; group_state.block_count += 1;
diagnostic_blocks.push(DiagnosticBlock::Context);
blocks_to_add.push(BlockProperties { blocks_to_add.push(BlockProperties {
position: header_position, position: header_position,
height: 1, height: 1,
@ -379,8 +370,6 @@ impl ProjectDiagnosticsEditor {
if !diagnostic.message.is_empty() { if !diagnostic.message.is_empty() {
group_state.block_count += 1; group_state.block_count += 1;
diagnostic_blocks
.push(DiagnosticBlock::Inline(diagnostic.clone()));
blocks_to_add.push(BlockProperties { blocks_to_add.push(BlockProperties {
position: (excerpt_id.clone(), entry.range.start.clone()), position: (excerpt_id.clone(), entry.range.start.clone()),
height: diagnostic.message.matches('\n').count() as u8 + 1, height: diagnostic.message.matches('\n').count() as u8 + 1,
@ -406,7 +395,7 @@ impl ProjectDiagnosticsEditor {
} else if let Some((group_ix, group_state)) = to_invalidate { } else if let Some((group_ix, group_state)) = to_invalidate {
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.iter().copied());
} else if let Some((_, group)) = to_keep { } else if let Some((_, group)) = to_keep {
prev_excerpt_id = group.excerpts.last().unwrap().clone(); prev_excerpt_id = group.excerpts.last().unwrap().clone();
} }
@ -430,8 +419,7 @@ impl ProjectDiagnosticsEditor {
}), }),
cx, cx,
) )
.into_iter() .into_iter();
.zip(diagnostic_blocks);
for group_state in &mut groups_to_add { for group_state in &mut groups_to_add {
group_state.blocks = block_ids.by_ref().take(group_state.block_count).collect(); group_state.blocks = block_ids.by_ref().take(group_state.block_count).collect();