Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 22:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix tests on windows

Browse source
This commit is contained in:
Aleksey Kladov 2018-09-05 15:03:27 +01:00
parent f87771092c
commit 649f7faf7d
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/libanalysis/tests/tests.rs
View file

@ -28,11 +28,18 @@ impl FileResolver for FileMap {
self.path(id).file_stem().unwrap().to_str().unwrap().to_string() self.path(id).file_stem().unwrap().to_str().unwrap().to_string()
} }
fn resolve(&self, id: FileId, rel: &RelativePath) -> Option<FileId> { fn resolve(&self, id: FileId, rel: &RelativePath) -> Option<FileId> {
let path = rel.to_path(self.path(id)); let path = {
let path = path.to_str().unwrap(); if rel.starts_with("..") {
let path = RelativePath::new(&path[1..]).normalize(); rel.strip_prefix("..").unwrap()
.to_path(&self.path(id).parent().unwrap())
} else {
rel.to_path(self.path(id))
}
};
let path = &path.to_str().unwrap()[1..];
let path = RelativePath::new(&path[0..]).normalize();
let &(id, _) = self.0.iter() let &(id, _) = self.0.iter()
.find(|it| path == RelativePath::new(&it.1[1..]).normalize())?; .find(|it| path == RelativePath::new(&it.1[0..]).normalize())?;
Some(FileId(id)) Some(FileId(id))
} }
} }