user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #12383 - Veykril:diag, r=Veykril

Browse source 
fix: Clear native diagnostics for files when they are deleted

Fixes https://github.com/rust-lang/rust-analyzer/issues/7004
This commit is contained in:
bors 2022-05-25 13:48:14 +00:00
commit c13f04dcaa
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/rust-analyzer/src/diagnostics.rs
View file

@ -40,6 +40,11 @@ impl DiagnosticCollection {
self.changes.extend(self.check.drain().map(|(key, _value)| key))
}
pub(crate) fn clear_native_for(&mut self, file_id: FileId) {
self.native.remove(&file_id);
self.changes.insert(file_id);
}
pub(crate) fn add_check_diagnostic(
&mut self,
file_id: FileId,

4
crates/rust-analyzer/src/global_state.rs
View file

@ -201,6 +201,10 @@ impl GlobalState {
}
}
if !file.exists() {
self.diagnostics.clear_native_for(file.file_id);
}
let text = if file.exists() {
let bytes = vfs.file_contents(file.file_id).to_vec();
String::from_utf8(bytes).ok().and_then(|text| {