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

take into account excludeDirs when computing linked_projects

Browse source
This commit is contained in:
Bernardo Uriarte 2022-05-21 16:18:55 +02:00
parent 7009e5ab35
commit 1ee8fefcff
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/rust-analyzer/src/config.rs
View file

@ -694,7 +694,22 @@ impl Config {
match self.data.linkedProjects.as_slice() { match self.data.linkedProjects.as_slice() {
[] => match self.discovered_projects.as_ref() { [] => match self.discovered_projects.as_ref() {
Some(discovered_projects) => { Some(discovered_projects) => {
discovered_projects.iter().cloned().map(LinkedProject::from).collect() let exclude_dirs: Vec<_> = self
.data
.files_excludeDirs
.iter()
.map(|p| self.root_path.join(p))
.collect();
discovered_projects
.iter()
.filter(|p| {
let (ProjectManifest::ProjectJson(path)
| ProjectManifest::CargoToml(path)) = p;
!exclude_dirs.iter().any(|p| path.starts_with(p))
})
.cloned()
.map(LinkedProject::from)
.collect()
} }
None => Vec::new(), None => Vec::new(),
}, },