From b72c6204e530987d825acb8b27667085b1c95158 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 5 Jul 2021 10:17:26 +0900
Subject: fix: When calculating relative path, expand tilde last

---
 helix-view/src/document.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index f85ded11..fdb6f8c3 100644
--- 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)
         })
     }
 
-- 
cgit v1.2.3-70-g09d2