suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: When calculating relative path, expand tilde last

pull/416/head
Blaž Hrastnik 2021-07-05 10:17:26 +09:00
parent cb4bab8903
commit b72c6204e5
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helix-view/src/document.rs
View File

@ -1049,14 +1049,12 @@ impl Document {
let cwdir = std::env::current_dir().expect("couldn't determine current directory"); let cwdir = std::env::current_dir().expect("couldn't determine current directory");
self.path.as_ref().map(|path| { self.path.as_ref().map(|path| {
let path = fold_home_dir(path); let path = if path.is_relative() {
if path.is_relative() { path.as_path()
path
} else { } else {
path.strip_prefix(cwdir) path.strip_prefix(cwdir).unwrap_or(path.as_path())
.map(|p| p.to_path_buf()) };
.unwrap_or(path) fold_home_dir(path)
}
}) })
} }