diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-18 19:08:32 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-18 19:08:32 +0000 |
commit | 132b207a228d0c588b08bbfffd53002b46521a1e (patch) | |
tree | 378e1f7c549a1ecf857df1019d74cdcb10d11d3e /crates | |
parent | 1cd18f9237b6ac48ca8461307f2a4eaf273ee394 (diff) | |
parent | e70e2361b602f7837e8fbed36ae1c51cd8e2f3b5 (diff) |
Merge #994
994: Upgrade ra_vfs to use new Filtering r=matklad a=vipentti
Upgrade `ra_vfs` to `0.2.0` that includes the filtering.
Currently this matches the previous filtering, meaning all roots are filtered
using the same rules.
Co-authored-by: Ville Penttinen <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_batch/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_batch/src/lib.rs | 29 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/server_world.rs | 30 |
4 files changed, 57 insertions, 6 deletions
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml index 5b78cb76e..3037e27c4 100644 --- a/crates/ra_batch/Cargo.toml +++ b/crates/ra_batch/Cargo.toml | |||
@@ -10,7 +10,7 @@ rustc-hash = "1.0" | |||
10 | 10 | ||
11 | failure = "0.1.4" | 11 | failure = "0.1.4" |
12 | 12 | ||
13 | ra_vfs = "0.1.0" | 13 | ra_vfs = "0.2.0" |
14 | ra_syntax = { path = "../ra_syntax" } | 14 | ra_syntax = { path = "../ra_syntax" } |
15 | ra_db = { path = "../ra_db" } | 15 | ra_db = { path = "../ra_db" } |
16 | ra_hir = { path = "../ra_hir" } | 16 | ra_hir = { path = "../ra_hir" } |
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs index c6d10107d..a054d0da3 100644 --- a/crates/ra_batch/src/lib.rs +++ b/crates/ra_batch/src/lib.rs | |||
@@ -1,5 +1,5 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | use std::path::Path; | 2 | use std::path::{Path, PathBuf}; |
3 | use std::collections::HashSet; | 3 | use std::collections::HashSet; |
4 | 4 | ||
5 | use rustc_hash::FxHashMap; | 5 | use rustc_hash::FxHashMap; |
@@ -9,7 +9,7 @@ use ra_db::{ | |||
9 | }; | 9 | }; |
10 | use ra_hir::{db, HirInterner}; | 10 | use ra_hir::{db, HirInterner}; |
11 | use ra_project_model::ProjectWorkspace; | 11 | use ra_project_model::ProjectWorkspace; |
12 | use ra_vfs::{Vfs, VfsChange}; | 12 | use ra_vfs::{Vfs, VfsChange, RootEntry, Filter, RelativePath}; |
13 | 13 | ||
14 | type Result<T> = std::result::Result<T, failure::Error>; | 14 | type Result<T> = std::result::Result<T, failure::Error>; |
15 | 15 | ||
@@ -43,6 +43,30 @@ fn vfs_root_to_id(r: ra_vfs::VfsRoot) -> SourceRootId { | |||
43 | SourceRootId(r.0.into()) | 43 | SourceRootId(r.0.into()) |
44 | } | 44 | } |
45 | 45 | ||
46 | struct IncludeRustFiles; | ||
47 | |||
48 | impl IncludeRustFiles { | ||
49 | fn to_entry(path: PathBuf) -> RootEntry { | ||
50 | RootEntry::new(path, Box::new(Self {})) | ||
51 | } | ||
52 | } | ||
53 | |||
54 | impl 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 | |||
46 | impl BatchDatabase { | 70 | impl BatchDatabase { |
47 | pub fn load(crate_graph: CrateGraph, vfs: &mut Vfs) -> BatchDatabase { | 71 | pub fn load(crate_graph: CrateGraph, vfs: &mut Vfs) -> BatchDatabase { |
48 | let mut db = | 72 | let mut db = |
@@ -100,6 +124,7 @@ impl BatchDatabase { | |||
100 | let mut roots = Vec::new(); | 124 | let mut roots = Vec::new(); |
101 | roots.push(root.clone()); | 125 | roots.push(root.clone()); |
102 | roots.extend(ws.to_roots()); | 126 | roots.extend(ws.to_roots()); |
127 | let roots = roots.into_iter().map(IncludeRustFiles::to_entry).collect::<Vec<_>>(); | ||
103 | let (mut vfs, roots) = Vfs::new(roots); | 128 | let (mut vfs, roots) = Vfs::new(roots); |
104 | let mut load = |path: &Path| { | 129 | let mut load = |path: &Path| { |
105 | let vfs_file = vfs.load(path); | 130 | let vfs_file = vfs.load(path); |
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 2b3890e01..d82410700 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -19,7 +19,7 @@ lsp-types = "0.56.0" | |||
19 | rustc-hash = "1.0" | 19 | rustc-hash = "1.0" |
20 | parking_lot = "0.7.0" | 20 | parking_lot = "0.7.0" |
21 | 21 | ||
22 | ra_vfs = "0.1.0" | 22 | ra_vfs = "0.2.0" |
23 | thread_worker = { path = "../thread_worker" } | 23 | thread_worker = { path = "../thread_worker" } |
24 | ra_syntax = { path = "../ra_syntax" } | 24 | ra_syntax = { path = "../ra_syntax" } |
25 | ra_text_edit = { path = "../ra_text_edit" } | 25 | ra_text_edit = { path = "../ra_text_edit" } |
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs index 7163568b9..cf7c17c5c 100644 --- a/crates/ra_lsp_server/src/server_world.rs +++ b/crates/ra_lsp_server/src/server_world.rs | |||
@@ -8,8 +8,8 @@ use ra_ide_api::{ | |||
8 | Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData, | 8 | Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData, |
9 | SourceRootId | 9 | SourceRootId |
10 | }; | 10 | }; |
11 | use ra_vfs::{Vfs, VfsChange, VfsFile, VfsRoot}; | 11 | use ra_vfs::{Vfs, VfsChange, VfsFile, VfsRoot, RootEntry, Filter}; |
12 | use relative_path::RelativePathBuf; | 12 | use relative_path::{RelativePath, RelativePathBuf}; |
13 | use parking_lot::RwLock; | 13 | use parking_lot::RwLock; |
14 | use failure::format_err; | 14 | use failure::format_err; |
15 | 15 | ||
@@ -33,6 +33,30 @@ pub struct ServerWorld { | |||
33 | pub vfs: Arc<RwLock<Vfs>>, | 33 | pub vfs: Arc<RwLock<Vfs>>, |
34 | } | 34 | } |
35 | 35 | ||
36 | struct IncludeRustFiles; | ||
37 | |||
38 | impl IncludeRustFiles { | ||
39 | fn to_entry(path: PathBuf) -> RootEntry { | ||
40 | RootEntry::new(path, Box::new(Self {})) | ||
41 | } | ||
42 | } | ||
43 | |||
44 | impl Filter for IncludeRustFiles { | ||
45 | fn include_dir(&self, dir_path: &RelativePath) -> bool { | ||
46 | const IGNORED_FOLDERS: &[&str] = &["node_modules", "target", ".git"]; | ||
47 | |||
48 | let is_ignored = dir_path.components().any(|c| IGNORED_FOLDERS.contains(&c.as_str())); | ||
49 | |||
50 | let hidden = dir_path.components().any(|c| c.as_str().starts_with(".")); | ||
51 | |||
52 | !is_ignored && !hidden | ||
53 | } | ||
54 | |||
55 | fn include_file(&self, file_path: &RelativePath) -> bool { | ||
56 | file_path.extension() == Some("rs") | ||
57 | } | ||
58 | } | ||
59 | |||
36 | impl ServerWorldState { | 60 | impl ServerWorldState { |
37 | pub fn new(root: PathBuf, workspaces: Vec<ProjectWorkspace>) -> ServerWorldState { | 61 | pub fn new(root: PathBuf, workspaces: Vec<ProjectWorkspace>) -> ServerWorldState { |
38 | let mut change = AnalysisChange::new(); | 62 | let mut change = AnalysisChange::new(); |
@@ -42,6 +66,8 @@ impl ServerWorldState { | |||
42 | for ws in workspaces.iter() { | 66 | for ws in workspaces.iter() { |
43 | roots.extend(ws.to_roots()); | 67 | roots.extend(ws.to_roots()); |
44 | } | 68 | } |
69 | let roots = roots.into_iter().map(IncludeRustFiles::to_entry).collect::<Vec<_>>(); | ||
70 | |||
45 | let (mut vfs, roots) = Vfs::new(roots); | 71 | let (mut vfs, roots) = Vfs::new(roots); |
46 | let roots_to_scan = roots.len(); | 72 | let roots_to_scan = roots.len(); |
47 | for r in roots { | 73 | for r in roots { |