fix: When calculating relative path, expand tilde last

justanotherdot · Jul 5, 2021 · b72c620 · b72c620
1 parent cb4bab8
commit b72c620
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
@@ -1049,14 +1049,12 @@ impl Document {
         let cwdir = std::env::current_dir().expect("couldn't determine current directory");
 
         self.path.as_ref().map(|path| {
-            let path = fold_home_dir(path);
-            if path.is_relative() {
-                path
+            let path = if path.is_relative() {
+                path.as_path()
             } else {
-                path.strip_prefix(cwdir)
-                    .map(|p| p.to_path_buf())
-                    .unwrap_or(path)
-            }
+                path.strip_prefix(cwdir).unwrap_or(path.as_path())
+            };
+            fold_home_dir(path)
         })
     }