itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2026-03-24 20:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21770 from Wilfred/vfs_remove_events

Browse Source 
fix: Update VFS when a watched file is deleted
This commit is contained in:
Lukas Wirth
2026-03-06 16:39:34 +00:00
committed by GitHub
parent a8e2add5c7 0241582099
commit 2f73b8de99
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/vfs-notify/src/lib.rs
View File

@@ -208,6 +208,22 @@ impl NotifyActor {
)
})
.filter_map(|path| -> Option<(AbsPathBuf, Option<Vec<u8>>)> {
// Ignore events for files/directories that we're not watching.
if !(self.watched_file_entries.contains(&path)
|| self
.watched_dir_entries
.iter()
.any(|dir| dir.contains_file(&path)))
{
return None;
}
// For removed files, fs::metadata() will return Err, but
// we still want to update the VFS.
if matches!(event.kind, EventKind::Remove(_)) {
return Some((path, None));
}
let meta = fs::metadata(&path).ok()?;
if meta.file_type().is_dir()
&& self
@@ -223,15 +239,6 @@ impl NotifyActor {
return None;
}
if !(self.watched_file_entries.contains(&path)
|| self
.watched_dir_entries
.iter()
.any(|dir| dir.contains_file(&path)))
{
return None;
}
let contents = read(&path);
Some((path, contents))
})