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

Show non-disk-based diagnostics in project diagnostics

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-01-27 16:23:50 +01:00
parent 4d9cdd474b
commit 37032f5eb2
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,10 +132,8 @@ impl ProjectDiagnosticsEditor {
let project = model.read(cx).project.clone(); let project = model.read(cx).project.clone();
cx.subscribe(&project, |this, _, event, cx| match event { cx.subscribe(&project, |this, _, event, cx| match event {
project::Event::DiskBasedDiagnosticsFinished => { project::Event::DiskBasedDiagnosticsFinished => {
this.summary = this.model.read(cx).project.read(cx).diagnostic_summary(cx); this.update_excerpts(cx);
let paths = mem::take(&mut this.paths_to_update); this.update_title(cx);
this.update_excerpts(paths, cx);
cx.emit(Event::TitleChanged);
} }
project::Event::DiagnosticsUpdated(path) => { project::Event::DiagnosticsUpdated(path) => {
this.paths_to_update.insert(path.clone()); this.paths_to_update.insert(path.clone());
@ -156,7 +154,7 @@ impl ProjectDiagnosticsEditor {
let project = project.read(cx); let project = project.read(cx);
let paths_to_update = project.diagnostic_summaries(cx).map(|e| e.0).collect(); let paths_to_update = project.diagnostic_summaries(cx).map(|e| e.0).collect();
let this = Self { let mut this = Self {
model, model,
summary: project.diagnostic_summary(cx), summary: project.diagnostic_summary(cx),
workspace, workspace,
@ -165,9 +163,9 @@ impl ProjectDiagnosticsEditor {
build_settings, build_settings,
settings, settings,
path_states: Default::default(), path_states: Default::default(),
paths_to_update: Default::default(), paths_to_update,
}; };
this.update_excerpts(paths_to_update, cx); this.update_excerpts(cx);
this this
} }
@ -222,7 +220,8 @@ impl ProjectDiagnosticsEditor {
} }
} }
fn update_excerpts(&self, paths: BTreeSet<ProjectPath>, cx: &mut ViewContext<Self>) { fn update_excerpts(&mut self, cx: &mut ViewContext<Self>) {
let paths = mem::take(&mut self.paths_to_update);
let project = self.model.read(cx).project.clone(); let project = self.model.read(cx).project.clone();
cx.spawn(|this, mut cx| { cx.spawn(|this, mut cx| {
async move { async move {
@ -280,12 +279,7 @@ impl ProjectDiagnosticsEditor {
let mut first_excerpt_id = None; let mut first_excerpt_id = None;
let excerpts_snapshot = self.excerpts.update(cx, |excerpts, excerpts_cx| { let excerpts_snapshot = self.excerpts.update(cx, |excerpts, excerpts_cx| {
let mut old_groups = path_state.diagnostic_groups.iter().enumerate().peekable(); let mut old_groups = path_state.diagnostic_groups.iter().enumerate().peekable();
let mut new_groups = snapshot let mut new_groups = snapshot.diagnostic_groups().into_iter().peekable();
.diagnostic_groups()
.into_iter()
.filter(|group| group.entries[group.primary_ix].diagnostic.is_disk_based)
.peekable();
loop { loop {
let mut to_insert = None; let mut to_insert = None;
let mut to_remove = None; let mut to_remove = None;
@ -526,6 +520,11 @@ impl ProjectDiagnosticsEditor {
} }
cx.notify(); cx.notify();
} }
fn update_title(&mut self, cx: &mut ViewContext<Self>) {
self.summary = self.model.read(cx).project.read(cx).diagnostic_summary(cx);
cx.emit(Event::TitleChanged);
}
} }
impl workspace::Item for ProjectDiagnostics { impl workspace::Item for ProjectDiagnostics {