language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Happy path implemented

Browse source
This commit is contained in:
Kirill Bulatov 2020-09-04 02:25:00 +03:00
parent 0de71f7bc9
commit 8aa740dab4
8 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/vfs/src/file_set.rs
View file

@ -34,22 +34,27 @@ impl FileSet {
&self,
anchor: FileId,
anchor_relative_path: Option<&str>,
) -> Option<Vec<(FileId, String)>> {
) -> Option<Vec<FileId>> {
let anchor_directory = {
let path = self.paths[&anchor].clone();
match anchor_relative_path {
Some(anchor_relative_path) => path.join(anchor_relative_path),
None => path.join("../"),
None => path.parent(),
}
}?;
Some(
self.paths
.iter()
.filter(|(_, path)| path.starts_with(&anchor_directory))
// TODO kb need to ensure that no / exists after the anchor_directory
.filter(|(_, path)| path.ends_with(".rs"))
.map(|(&file_id, path)| (file_id, path.to_string()))
.filter_map(|(&file_id, path)| {
if path.parent()? == anchor_directory
&& matches!(path.file_name_and_extension(), Some((_, Some("rs"))))
{
Some(file_id)
} else {
None
}
})
.collect(),
)
}