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

Fix: revert complex conditional in Directories::contains_file

Browse source 
This reverts commit 6d0336b2e4.
This commit is contained in:
Basti Ortiz 2021-08-10 22:25:43 +08:00
parent 7ee6cca3d7
commit ae1288eeed
No known key found for this signature in database
GPG key ID: 1402D5CB17F48E1B
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/vfs/src/loader.rs
View file

@ -137,7 +137,10 @@ impl Directories {
/// Returns `true` if `path` is included in `self`. /// Returns `true` if `path` is included in `self`.
pub fn contains_file(&self, path: &AbsPath) -> bool { pub fn contains_file(&self, path: &AbsPath) -> bool {
let ext = path.extension().unwrap_or_default(); let ext = path.extension().unwrap_or_default();
self.extensions.iter().any(|it| it.as_str() == ext) && self.includes_path(path) if self.extensions.iter().all(|it| it.as_str() != ext) {
return false;
}
self.includes_path(path)
} }
/// Returns `true` if `path` is included in `self`. /// Returns `true` if `path` is included in `self`.