1 files changed, 23 insertions, 16 deletions

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 7a7617c0..0481b9af 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -104,6 +104,10 @@ pub fn normalize_path(path: &Path) -> PathBuf {
     ret
 }
 
+pub fn canonicalize_path(path: &Path) -> std::io::Result<PathBuf> {
+    std::env::current_dir().map(|current_dir| normalize_path(&current_dir.join(path)))
+}
+
 use helix_lsp::lsp;
 use url::Url;
 
@@ -133,13 +137,14 @@ impl Document {
 
     // TODO: async fn?
     pub fn load(path: PathBuf) -> Result<Self, Error> {
-        use std::{env, fs::File, io::BufReader};
-        let _current_dir = env::current_dir()?;
-
-        let file = File::open(path.clone()).context(format!("unable to open {:?}", path))?;
-        let doc = Rope::from_reader(BufReader::new(file))?;
+        use std::{fs::File, io::BufReader};
 
-        // TODO: create if not found
+        let doc = if !path.exists() {
+            Rope::from("\n")
+        } else {
+            let file = File::open(&path).context(format!("unable to open {:?}", path))?;
+            Rope::from_reader(BufReader::new(file))?
+        };
 
         let mut doc = Self::new(doc);
         // set the path and try detecting the language
@@ -192,6 +197,13 @@ impl Document {
 
         async move {
             use tokio::{fs::File, io::AsyncWriteExt};
+            if let Some(parent) = path.parent() {
+                if !parent.exists() {
+                    return Err(Error::msg(
+                        "can't save file, parent directory does not exist",
+                    ));
+                }
+            }
             let mut file = File::create(path).await?;
 
             // write all the rope chunks to file
@@ -220,16 +232,11 @@ impl Document {
     }
 
     pub fn set_path(&mut self, path: &Path) -> Result<(), std::io::Error> {
-        // canonicalize path to absolute value
-        let current_dir = std::env::current_dir()?;
-        let path = normalize_path(&current_dir.join(path));
-
-        if let Some(parent) = path.parent() {
-            // TODO: return error as necessary
-            if parent.exists() {
-                self.path = Some(path);
-            }
-        }
+        let path = canonicalize_path(path)?;
+
+        // if parent doesn't exist we still want to open the document
+        // and error out when document is saved
+        self.path = Some(path);
 
         // try detecting the language based on filepath
         self.detect_language();