aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorammkrn <[email protected]>2021-05-25 16:07:01 +0100
committerammkrn <[email protected]>2021-05-25 17:35:39 +0100
commit96ee19851b18c10049c0951445a4087f7d069fbb (patch)
treeb02673722a43d30a99fd3b290afd2e20578944e8
parent35db5e99f6f982f4257e88d13cbecca250b05efe (diff)
Check for subdirs in vfs loader exclusions.
The current logic used to transfer global_excludes into vfs exclusions only transfers global_excludes that are the parent of an item in dirs.include. This commit additionally adds an item from global_exclude to the vfs exclusions if the global_exclude is a child of an included item.
-rw-r--r--crates/rust-analyzer/src/reload.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 7a53e4a8b..93b5ff55f 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -455,7 +455,11 @@ impl ProjectFolders {
455 dirs.include.extend(root.include); 455 dirs.include.extend(root.include);
456 dirs.exclude.extend(root.exclude); 456 dirs.exclude.extend(root.exclude);
457 for excl in global_excludes { 457 for excl in global_excludes {
458 if dirs.include.iter().any(|incl| incl.starts_with(excl)) { 458 if dirs
459 .include
460 .iter()
461 .any(|incl| incl.starts_with(excl) || excl.starts_with(incl))
462 {
459 dirs.exclude.push(excl.clone()); 463 dirs.exclude.push(excl.clone());
460 } 464 }
461 } 465 }