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

extend module resolve to mod.rs

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-17 16:04:34 +03:00
parent 081c16c776
commit 41570f60bf
8 changed files with 82 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/libanalysis/src/lib.rs
View file

@ -163,15 +163,21 @@ impl World {
Some(name) => name.text(),
None => return Vec::new(),
};
let id = match self.resolve_relative_path(id, &PathBuf::from(format!("../{}.rs", name))) {
Some(id) => id,
None => return Vec::new(),
};
vec![(id, FileSymbol {
name: name.clone(),
node_range: TextRange::offset_len(0.into(), 0.into()),
kind: MODULE,
})]
let paths = &[
PathBuf::from(format!("../{}.rs", name)),
PathBuf::from(format!("../{}/mod.rs", name)),
];
paths.iter()
.filter_map(|path| self.resolve_relative_path(id, path))
.map(|id| {
let symbol = FileSymbol {
name: name.clone(),
node_range: TextRange::offset_len(0.into(), 0.into()),
kind: MODULE,
};
(id, symbol)
})
.collect()
}
fn resolve_relative_path(&self, id: FileId, path: &Path) -> Option<FileId> {