aboutsummaryrefslogtreecommitdiff
path: root/helix-view
diff options
context:
space:
mode:
authorWojciech Kępka2021-06-06 05:09:50 +0000
committerIvan Tham2021-06-06 09:28:09 +0000
commit14f511da930afda1e9a2201f628daff9f96a0948 (patch)
tree3702496c9b0fd83b28cc4c0706b9b2385c549f52 /helix-view
parent392631b21df0d49e56322f26ca78e0ef2d9f8789 (diff)
Create document if it doesn't exist on save
Diffstat (limited to 'helix-view')
-rw-r--r--helix-view/src/document.rs39
-rw-r--r--helix-view/src/editor.rs2
2 files changed, 24 insertions, 17 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();
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index d991f250..fa8dea2f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -137,7 +137,7 @@ impl Editor {
}
pub fn open(&mut self, path: PathBuf, action: Action) -> Result<DocumentId, Error> {
- let path = std::fs::canonicalize(path)?;
+ let path = crate::document::canonicalize_path(&path)?;
let id = self
.documents()