Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 05:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18817 from Veykril/push-zzkkotwuyqzt

Browse source 
fix: Fix flycheck cancellations leaving stale errors
This commit is contained in:
Lukas Wirth 2025-01-02 08:52:30 +00:00 committed by GitHub
commit 4500856e45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/rust-analyzer/src/flycheck.rs
View file

@ -353,19 +353,7 @@ impl FlycheckActor {
package_id: None, package_id: None,
}); });
} else { } else {
for (package_id, status) in mem::take(&mut self.package_status) { self.send_clear_diagnostics();
if let DiagnosticReceived::No = status {
tracing::trace!(
flycheck_id = self.id,
package_id = package_id.repr,
"clearing diagnostics"
);
self.send(FlycheckMessage::ClearDiagnostics {
id: self.id,
package_id: Some(package_id),
});
}
}
} }
self.report_progress(Progress::DidFinish(res)); self.report_progress(Progress::DidFinish(res));
@ -429,7 +417,23 @@ impl FlycheckActor {
command_handle.cancel(); command_handle.cancel();
self.command_receiver.take(); self.command_receiver.take();
self.report_progress(Progress::DidCancel); self.report_progress(Progress::DidCancel);
self.package_status.clear(); self.send_clear_diagnostics();
}
}
fn send_clear_diagnostics(&mut self) {
for (package_id, status) in mem::take(&mut self.package_status) {
if let DiagnosticReceived::No = status {
tracing::trace!(
flycheck_id = self.id,
package_id = package_id.repr,
"clearing diagnostics"
);
self.send(FlycheckMessage::ClearDiagnostics {
id: self.id,
package_id: Some(package_id),
});
}
} }
} }