itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18864 from alexkirsz/alexkirsz/fix-diagnostics-clearing

Browse Source 
fix: Fix diagnostics not clearing between flychecks
This commit is contained in:
Lukas Wirth 2025-01-07 12:16:18 +00:00 committed by GitHub
commit efb87743be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/rust-analyzer/src/flycheck.rs
View File

@ -233,6 +233,7 @@ struct FlycheckActor {
/// The receiver side of the channel mentioned above. /// The receiver side of the channel mentioned above.
command_receiver: Option<Receiver<CargoCheckMessage>>, command_receiver: Option<Receiver<CargoCheckMessage>>,
diagnostics_cleared_for: FxHashSet<Arc<PackageId>>, diagnostics_cleared_for: FxHashSet<Arc<PackageId>>,
diagnostics_cleared_for_all: bool,
diagnostics_received: bool, diagnostics_received: bool,
} }
@ -264,6 +265,7 @@ impl FlycheckActor {
command_handle: None, command_handle: None,
command_receiver: None, command_receiver: None,
diagnostics_cleared_for: Default::default(), diagnostics_cleared_for: Default::default(),
diagnostics_cleared_for_all: false,
diagnostics_received: false, diagnostics_received: false,
} }
} }
@ -350,6 +352,7 @@ impl FlycheckActor {
package_id: None, package_id: None,
}); });
} }
self.clear_diagnostics_state();
self.report_progress(Progress::DidFinish(res)); self.report_progress(Progress::DidFinish(res));
} }
@ -395,6 +398,12 @@ impl FlycheckActor {
package_id: Some(package_id.clone()), package_id: Some(package_id.clone()),
}); });
} }
} else if !self.diagnostics_cleared_for_all {
self.diagnostics_cleared_for_all = true;
self.send(FlycheckMessage::ClearDiagnostics {
id: self.id,
package_id: None,
});
} }
self.send(FlycheckMessage::AddDiagnostic { self.send(FlycheckMessage::AddDiagnostic {
id: self.id, id: self.id,
@ -420,7 +429,12 @@ impl FlycheckActor {
self.command_receiver.take(); self.command_receiver.take();
self.report_progress(Progress::DidCancel); self.report_progress(Progress::DidCancel);
} }
self.clear_diagnostics_state();
}
fn clear_diagnostics_state(&mut self) {
self.diagnostics_cleared_for.clear(); self.diagnostics_cleared_for.clear();
self.diagnostics_cleared_for_all = false;
self.diagnostics_received = false; self.diagnostics_received = false;
} }