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

Make VFS join methods fallible

Browse source
This commit is contained in:
Jonas Schievink 2020-06-26 16:25:08 +02:00
parent 38cd1b70e8
commit 72fe70f2f8
4 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/vfs/src/vfs_path.rs
View file

@ -22,15 +22,15 @@ impl VfsPath {
VfsPathRepr::VirtualPath(_) => None,
}
}
pub fn join(&self, path: &str) -> VfsPath {
pub fn join(&self, path: &str) -> Option<VfsPath> {
match &self.0 {
VfsPathRepr::PathBuf(it) => {
let res = it.join(path).normalize();
VfsPath(VfsPathRepr::PathBuf(res))
Some(VfsPath(VfsPathRepr::PathBuf(res)))
}
VfsPathRepr::VirtualPath(it) => {
let res = it.join(path);
VfsPath(VfsPathRepr::VirtualPath(res))
let res = it.join(path)?;
Some(VfsPath(VfsPathRepr::VirtualPath(res)))
}
}
}
@ -101,13 +101,15 @@ impl VirtualPath {
self.0 = self.0[..pos].to_string();
true
}
fn join(&self, mut path: &str) -> VirtualPath {
fn join(&self, mut path: &str) -> Option<VirtualPath> {
let mut res = self.clone();
while path.starts_with("../") {
assert!(res.pop());
if !res.pop() {
return None;
}
path = &path["../".len()..]
}
res.0 = format!("{}/{}", res.0, path);
res
Some(res)
}
}