aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSkyler Hawthorne2022-07-05 04:15:15 +0000
committerSkyler Hawthorne2022-10-19 02:31:38 +0000
commitc9418582d2a6d8dbb8b5bb1d3432a9087438e61d (patch)
tree6784100e0d2e46caf69ee983786ad16e9265548a
parentcb23399dee723cec67f1a04dbe6514dfddfd7f5f (diff)
fix modified status with auto format
-rw-r--r--helix-term/src/commands.rs17
-rw-r--r--helix-term/src/commands/typed.rs35
-rw-r--r--helix-view/src/document.rs1
3 files changed, 36 insertions, 17 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a4421f03..e76e0280 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -52,7 +52,7 @@ use crate::{
};
use crate::job::{self, Jobs};
-use futures_util::{FutureExt, StreamExt};
+use futures_util::StreamExt;
use std::{collections::HashMap, fmt, future::Future};
use std::{collections::HashSet, num::NonZeroUsize};
@@ -2513,6 +2513,7 @@ async fn make_format_callback(
doc_id: DocumentId,
doc_version: i32,
format: impl Future<Output = Result<Transaction, FormatterError>> + Send + 'static,
+ write: Option<(Option<PathBuf>, bool)>,
) -> anyhow::Result<job::Callback> {
let format = format.await?;
let call: job::Callback = Box::new(move |editor, _compositor| {
@@ -2523,11 +2524,25 @@ async fn make_format_callback(
let scrolloff = editor.config().scrolloff;
let doc = doc_mut!(editor, &doc_id);
let view = view_mut!(editor);
+ let loader = editor.syn_loader.clone();
+
if doc.version() == doc_version {
apply_transaction(&format, doc, view);
doc.append_changes_to_history(view.id);
doc.detect_indent_and_line_ending();
view.ensure_cursor_in_view(doc, scrolloff);
+
+ if let Some((path, force)) = write {
+ let refresh_lang = path.is_some();
+
+ if let Err(err) = doc.save(path, force) {
+ editor.set_error(format!("Error saving: {}", err));
+ } else if refresh_lang {
+ let id = doc.id();
+ doc.detect_language(loader);
+ let _ = editor.refresh_language_server(id);
+ }
+ }
} else {
log::info!("discarded formatting changes because the document changed");
}
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 650ff75d..955b3b58 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -267,30 +267,32 @@ fn write_impl(
path: Option<&Cow<str>>,
force: bool,
) -> anyhow::Result<()> {
- let auto_format = cx.editor.config().auto_format;
+ let editor_auto_fmt = cx.editor.config().auto_format;
let jobs = &mut cx.jobs;
let doc = doc_mut!(cx.editor);
+ let path = path.map(AsRef::as_ref);
if doc.path().is_none() {
bail!("cannot write a buffer without a filename");
}
- let fmt = if auto_format {
+
+ let fmt = if editor_auto_fmt {
doc.auto_format().map(|fmt| {
- let shared = fmt.shared();
- let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
+ let callback = make_format_callback(
+ doc.id(),
+ doc.version(),
+ fmt,
+ Some((path.map(Into::into), force)),
+ );
+
jobs.add(Job::with_callback(callback).wait_before_exiting());
- shared
})
} else {
None
};
- doc.format_and_save(fmt, path.map(AsRef::as_ref), force)?;
-
- if path.is_some() {
- let id = doc.id();
- doc.detect_language(cx.editor.syn_loader.clone());
- let _ = cx.editor.refresh_language_server(id);
+ if fmt.is_none() {
+ doc.save(path, force)?;
}
Ok(())
@@ -345,7 +347,7 @@ fn format(
let doc = doc!(cx.editor);
if let Some(format) = doc.format() {
- let callback = make_format_callback(doc.id(), doc.version(), format);
+ let callback = make_format_callback(doc.id(), doc.version(), format, None);
cx.jobs.callback(callback);
}
@@ -592,16 +594,17 @@ fn write_all_impl(
let fmt = if auto_format {
doc.auto_format().map(|fmt| {
- let shared = fmt.shared();
- let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
+ let callback =
+ make_format_callback(doc.id(), doc.version(), fmt, Some((None, force)));
jobs.callback(callback);
- shared
})
} else {
None
};
- doc.format_and_save::<_, PathBuf>(fmt, None, force)?;
+ if fmt.is_none() {
+ doc.save::<PathBuf>(None, force)?;
+ }
}
if quit {
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 1743fac2..fe081442 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -14,6 +14,7 @@ use std::path::{Path, PathBuf};
use std::str::FromStr;
use std::sync::Arc;
use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
+
use tokio::sync::Mutex;
use helix_core::{