Save command

pull/5/head
Blaž Hrastnik 4 years ago
parent 8f0bcfe286
commit 3f707c19f4

1
Cargo.lock generated

@ -523,6 +523,7 @@ dependencies = [
"crossterm", "crossterm",
"helix-core", "helix-core",
"once_cell", "once_cell",
"smol",
"tui", "tui",
"url", "url",
] ]

@ -70,16 +70,10 @@ fn main() -> Result<(), Error> {
std::thread::spawn(move || smol::block_on(EX.run(smol::future::pending::<()>()))); std::thread::spawn(move || smol::block_on(EX.run(smol::future::pending::<()>())));
} }
// let mut lsp = helix_lsp::Client::start(&EX, "rust-analyzer", &[]); let mut app = Application::new(args, &EX).unwrap();
smol::block_on(async { // we use the thread local executor to spawn the application task separately from the work pool
// let res = lsp.initialize().await; smol::block_on(app.run());
// let state = helix_core::State::load("test.rs".into(), &[]).unwrap();
// let res = lsp.text_document_did_open(&state).await;
// loop {}
Application::new(args, &EX).unwrap().run().await;
});
Ok(()) Ok(())
} }

@ -20,3 +20,5 @@ tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, feat
crossterm = { version = "0.18", features = ["event-stream"], optional = true} crossterm = { version = "0.18", features = ["event-stream"], optional = true}
once_cell = "1.4" once_cell = "1.4"
url = "2" url = "2"
smol = "1"

@ -331,8 +331,7 @@ pub fn append_mode(cx: &mut Context) {
} }
// TODO: I, A, o and O can share a lot of the primitives. // TODO: I, A, o and O can share a lot of the primitives.
pub fn command_mode(_cx: &mut Context) {
pub fn command_mode(_view: &mut View, _count: usize) {
unimplemented!() unimplemented!()
} }
@ -670,3 +669,12 @@ pub fn indent_selection(_cx: &mut Context) {
// loop over each line and recompute proper indentation // loop over each line and recompute proper indentation
unimplemented!() unimplemented!()
} }
//
pub fn save(cx: &mut Context) {
// Spawns an async task to actually do the saving. This way we prevent blocking.
// TODO: handle save errors somehow?
cx.executor.spawn(cx.view.doc.save()).detach();
}

@ -1,4 +1,5 @@
use anyhow::Error; use anyhow::Error;
use std::future::Future;
use std::path::PathBuf; use std::path::PathBuf;
use helix_core::{ use helix_core::{
@ -97,6 +98,30 @@ impl Document {
Ok(doc) Ok(doc)
} }
pub fn save(&self) -> impl Future<Output = Result<(), anyhow::Error>> {
// we clone and move text + path into the future so that we asynchronously save the current
// state without blocking any further edits.
let text = self.text().clone();
let path = self.path.clone().expect("Can't save with no path set!"); // TODO: handle no path
// TODO: mark changes up to now as saved
// TODO: mark dirty false
async move {
use smol::{fs::File, prelude::*};
let mut file = File::create(path).await?;
// write all the rope chunks to file
for chunk in text.chunks() {
file.write_all(chunk.as_bytes()).await?;
}
// TODO: flush?
Ok(())
} // and_then(// lsp.send_text_saved_notification())
}
pub fn set_language(&mut self, scope: &str, scopes: &[String]) { pub fn set_language(&mut self, scope: &str, scopes: &[String]) {
if let Some(language_config) = LOADER.language_config_for_scope(scope) { if let Some(language_config) = LOADER.language_config_for_scope(scope) {
let highlight_config = language_config.highlight_config(scopes).unwrap().unwrap(); let highlight_config = language_config.highlight_config(scopes).unwrap().unwrap();

Loading…
Cancel
Save