language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move actual include logic to ProjectRoot

Browse source 
This way the two IncludeRustFiles implementations can simply call the
ProjectRoots' methods, so that the include logic is in one place.
This commit is contained in:
Ville Penttinen 2019-03-21 10:43:47 +02:00
parent e32462c6d5
commit c6d6e6c625
5 changed files with 71 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

47
crates/ra_lsp_server/src/vfs_filter.rs
View file

@ -2,9 +2,10 @@ use std::path::PathBuf;
use ra_project_model::ProjectRoot;
use ra_vfs::{RootEntry, Filter, RelativePath};
/// `IncludeRustFiles` is used to convert
/// from `ProjectRoot` to `RootEntry` for VFS
pub struct IncludeRustFiles {
/// Is a member of the current workspace
is_member: bool,
root: ProjectRoot,
}
impl IncludeRustFiles {
@ -16,44 +17,38 @@ impl IncludeRustFiles {
}
pub fn from_root(root: ProjectRoot) -> RootEntry {
let is_member = root.is_member();
IncludeRustFiles::into_entry(root.into_path(), is_member)
IncludeRustFiles::from(root).into()
}
#[allow(unused)]
pub fn external(path: PathBuf) -> RootEntry {
IncludeRustFiles::into_entry(path, false)
IncludeRustFiles::from_root(ProjectRoot::new(path, false))
}
pub fn member(path: PathBuf) -> RootEntry {
IncludeRustFiles::into_entry(path, true)
}
fn into_entry(path: PathBuf, is_member: bool) -> RootEntry {
RootEntry::new(path, Box::new(Self { is_member }))
IncludeRustFiles::from_root(ProjectRoot::new(path, true))
}
}
impl Filter for IncludeRustFiles {
fn include_dir(&self, dir_path: &RelativePath) -> bool {
const COMMON_IGNORED_DIRS: &[&str] = &["node_modules", "target", ".git"];
const EXTERNAL_IGNORED_DIRS: &[&str] = &["examples", "tests", "benches"];
let is_ignored = if self.is_member {
dir_path.components().any(|c| COMMON_IGNORED_DIRS.contains(&c.as_str()))
} else {
dir_path.components().any(|c| {
let path = c.as_str();
COMMON_IGNORED_DIRS.contains(&path) || EXTERNAL_IGNORED_DIRS.contains(&path)
})
};
let hidden = dir_path.components().any(|c| c.as_str().starts_with("."));
!is_ignored && !hidden
self.root.include_dir(dir_path)
}
fn include_file(&self, file_path: &RelativePath) -> bool {
file_path.extension() == Some("rs")
self.root.include_file(file_path)
}
}
impl std::convert::From<ProjectRoot> for IncludeRustFiles {
fn from(v: ProjectRoot) -> IncludeRustFiles {
IncludeRustFiles { root: v }
}
}
impl std::convert::From<IncludeRustFiles> for RootEntry {
fn from(v: IncludeRustFiles) -> RootEntry {
let path = v.root.path().clone();
RootEntry::new(path, Box::new(v))
}
}