git.iko.soy/helix
on master help sign in
fix: When calculating relative path, expand tilde last
b72c620Blaž Hrastnik
helix-view/src/document.rs+5−7
compare with master
unifiedsplit
@@ -1049,14 +1049,12 @@ impl Document {
1049 let cwdir = std::env::current_dir().expect("couldn't determine current directory");
1049 let cwdir = std::env::current_dir().expect("couldn't determine current directory");
1050
1050
1051 self.path.as_ref().map(|path| {
1051 self.path.as_ref().map(|path| {
1052− let path = fold_home_dir(path);
1053− if path.is_relative() {
1052+ let path = if path.is_relative() {
1054− path
1053+ path.as_path()
1055 } else {
1054 } else {
1056− path.strip_prefix(cwdir)
1055+ path.strip_prefix(cwdir).unwrap_or(path.as_path())
1057− .map(|p| p.to_path_buf())
1058− .unwrap_or(path)
1059− }
1056+ };
1057+ fold_home_dir(path)
1060 })
1058 })
1061 }
1059 }
1062
1060