Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Follow symlinks when walking project trees

Browse source 
Fixes #3691
This commit is contained in:
Daniel Fox Franke 2020-10-15 14:22:36 -04:00
parent 84d6cdef86
commit e821aa842b
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/vfs-notify/src/lib.rs
View file

@ -165,14 +165,15 @@ impl NotifyActor {
let mut res = Vec::new(); let mut res = Vec::new();
for root in dirs.include.iter() { for root in dirs.include.iter() {
let walkdir = WalkDir::new(root).into_iter().filter_entry(|entry| { let walkdir =
if !entry.file_type().is_dir() { WalkDir::new(root).follow_links(true).into_iter().filter_entry(|entry| {
return true; if !entry.file_type().is_dir() {
} return true;
let path = AbsPath::assert(entry.path()); }
root == path let path = AbsPath::assert(entry.path());
|| dirs.exclude.iter().chain(&dirs.include).all(|it| it != path) root == path
}); || dirs.exclude.iter().chain(&dirs.include).all(|it| it != path)
});
let files = walkdir.filter_map(|it| it.ok()).filter_map(|entry| { let files = walkdir.filter_map(|it| it.ok()).filter_map(|entry| {
let is_dir = entry.file_type().is_dir(); let is_dir = entry.file_type().is_dir();