aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_batch
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_batch')
-rw-r--r--crates/ra_batch/src/lib.rs36
-rw-r--r--crates/ra_batch/src/vfs_filter.rs59
2 files changed, 66 insertions, 29 deletions
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs
index a054d0da3..deb9f95d7 100644
--- a/crates/ra_batch/src/lib.rs
+++ b/crates/ra_batch/src/lib.rs
@@ -1,5 +1,7 @@
1mod vfs_filter;
2
1use std::sync::Arc; 3use std::sync::Arc;
2use std::path::{Path, PathBuf}; 4use std::path::Path;
3use std::collections::HashSet; 5use std::collections::HashSet;
4 6
5use rustc_hash::FxHashMap; 7use rustc_hash::FxHashMap;
@@ -9,7 +11,8 @@ use ra_db::{
9}; 11};
10use ra_hir::{db, HirInterner}; 12use ra_hir::{db, HirInterner};
11use ra_project_model::ProjectWorkspace; 13use ra_project_model::ProjectWorkspace;
12use ra_vfs::{Vfs, VfsChange, RootEntry, Filter, RelativePath}; 14use ra_vfs::{Vfs, VfsChange};
15use vfs_filter::IncludeRustFiles;
13 16
14type Result<T> = std::result::Result<T, failure::Error>; 17type Result<T> = std::result::Result<T, failure::Error>;
15 18
@@ -43,30 +46,6 @@ fn vfs_root_to_id(r: ra_vfs::VfsRoot) -> SourceRootId {
43 SourceRootId(r.0.into()) 46 SourceRootId(r.0.into())
44} 47}
45 48
46struct IncludeRustFiles;
47
48impl IncludeRustFiles {
49 fn to_entry(path: PathBuf) -> RootEntry {
50 RootEntry::new(path, Box::new(Self {}))
51 }
52}
53
54impl Filter for IncludeRustFiles {
55 fn include_dir(&self, dir_path: &RelativePath) -> bool {
56 const IGNORED_FOLDERS: &[&str] = &["node_modules", "target", ".git"];
57
58 let is_ignored = dir_path.components().any(|c| IGNORED_FOLDERS.contains(&c.as_str()));
59
60 let hidden = dir_path.components().any(|c| c.as_str().starts_with("."));
61
62 !is_ignored && !hidden
63 }
64
65 fn include_file(&self, file_path: &RelativePath) -> bool {
66 file_path.extension() == Some("rs")
67 }
68}
69
70impl BatchDatabase { 49impl BatchDatabase {
71 pub fn load(crate_graph: CrateGraph, vfs: &mut Vfs) -> BatchDatabase { 50 pub fn load(crate_graph: CrateGraph, vfs: &mut Vfs) -> BatchDatabase {
72 let mut db = 51 let mut db =
@@ -122,9 +101,8 @@ impl BatchDatabase {
122 let root = std::env::current_dir()?.join(root); 101 let root = std::env::current_dir()?.join(root);
123 let ws = ProjectWorkspace::discover(root.as_ref())?; 102 let ws = ProjectWorkspace::discover(root.as_ref())?;
124 let mut roots = Vec::new(); 103 let mut roots = Vec::new();
125 roots.push(root.clone()); 104 roots.push(IncludeRustFiles::member(root.clone()));
126 roots.extend(ws.to_roots()); 105 roots.extend(IncludeRustFiles::from_roots(ws.to_roots()));
127 let roots = roots.into_iter().map(IncludeRustFiles::to_entry).collect::<Vec<_>>();
128 let (mut vfs, roots) = Vfs::new(roots); 106 let (mut vfs, roots) = Vfs::new(roots);
129 let mut load = |path: &Path| { 107 let mut load = |path: &Path| {
130 let vfs_file = vfs.load(path); 108 let vfs_file = vfs.load(path);
diff --git a/crates/ra_batch/src/vfs_filter.rs b/crates/ra_batch/src/vfs_filter.rs
new file mode 100644
index 000000000..290aec172
--- /dev/null
+++ b/crates/ra_batch/src/vfs_filter.rs
@@ -0,0 +1,59 @@
1use std::path::PathBuf;
2use ra_project_model::ProjectRoot;
3use ra_vfs::{RootEntry, Filter, RelativePath};
4
5pub struct IncludeRustFiles {
6 /// Is a member of the current workspace
7 is_member: bool,
8}
9
10impl IncludeRustFiles {
11 pub fn from_roots<R>(roots: R) -> impl Iterator<Item = RootEntry>
12 where
13 R: IntoIterator<Item = ProjectRoot>,
14 {
15 roots.into_iter().map(IncludeRustFiles::from_root)
16 }
17
18 pub fn from_root(root: ProjectRoot) -> RootEntry {
19 let is_member = root.is_member();
20 IncludeRustFiles::into_entry(root.into_path(), is_member)
21 }
22
23 #[allow(unused)]
24 pub fn external(path: PathBuf) -> RootEntry {
25 IncludeRustFiles::into_entry(path, false)
26 }
27
28 pub fn member(path: PathBuf) -> RootEntry {
29 IncludeRustFiles::into_entry(path, true)
30 }
31
32 fn into_entry(path: PathBuf, is_member: bool) -> RootEntry {
33 RootEntry::new(path, Box::new(Self { is_member }))
34 }
35}
36
37impl Filter for IncludeRustFiles {
38 fn include_dir(&self, dir_path: &RelativePath) -> bool {
39 const COMMON_IGNORED_DIRS: &[&str] = &["node_modules", "target", ".git"];
40 const EXTERNAL_IGNORED_DIRS: &[&str] = &["examples", "tests", "benches"];
41
42 let is_ignored = if self.is_member {
43 dir_path.components().any(|c| COMMON_IGNORED_DIRS.contains(&c.as_str()))
44 } else {
45 dir_path.components().any(|c| {
46 let path = c.as_str();
47 COMMON_IGNORED_DIRS.contains(&path) || EXTERNAL_IGNORED_DIRS.contains(&path)
48 })
49 };
50
51 let hidden = dir_path.components().any(|c| c.as_str().starts_with("."));
52
53 !is_ignored && !hidden
54 }
55
56 fn include_file(&self, file_path: &RelativePath) -> bool {
57 file_path.extension() == Some("rs")
58 }
59}