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

less hacky paths

Browse source
This commit is contained in:
Aleksey Kladov 2018-09-05 18:27:44 +03:00
parent ad451686a8
commit d0e22d7578
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use std::{
path::{Path}, path::{Path},
}; };
use relative_path::RelativePath; use relative_path::{RelativePath, RelativePathBuf};
use libanalysis::{AnalysisHost, FileId, FileResolver, JobHandle, CrateGraph, CrateId}; use libanalysis::{AnalysisHost, FileId, FileResolver, JobHandle, CrateGraph, CrateId};
use test_utils::assert_eq_dbg; use test_utils::assert_eq_dbg;
@ -28,18 +28,15 @@ 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 = { let path = rel.to_path(self.path(id));
if rel.starts_with("..") { let path = path.strip_prefix("/").unwrap();
rel.strip_prefix("..").unwrap() let path = RelativePathBuf::from_path(&path).unwrap().normalize();
.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[0..]).normalize())?; .find(|it| {
let p = Path::new(it.1).strip_prefix("/").unwrap();
let p = RelativePathBuf::from_path(p).unwrap();
path == p
})?;
Some(FileId(id)) Some(FileId(id))
} }
} }