git.iko.soy/helix
on master help sign in
fix modified status with auto format
c941858Skyler Hawthorne
helix-term/src/commands.rs+16−1
compare with master
unifiedsplit
@@ -52,7 +52,7 @@ use crate::{
52};
52};
53
53
54use crate::job::{self, Jobs};
54use crate::job::{self, Jobs};
55−use futures_util::{FutureExt, StreamExt};
55+use futures_util::StreamExt;
56use std::{collections::HashMap, fmt, future::Future};
56use std::{collections::HashMap, fmt, future::Future};
57use std::{collections::HashSet, num::NonZeroUsize};
57use std::{collections::HashSet, num::NonZeroUsize};
58
58
@@ -2513,6 +2513,7 @@ async fn make_format_callback(
2513 doc_id: DocumentId,
2513 doc_id: DocumentId,
2514 doc_version: i32,
2514 doc_version: i32,
2515 format: impl Future<Output = Result<Transaction, FormatterError>> + Send + 'static,
2515 format: impl Future<Output = Result<Transaction, FormatterError>> + Send + 'static,
2516+ write: Option<(Option<PathBuf>, bool)>,
2516) -> anyhow::Result<job::Callback> {
2517) -> anyhow::Result<job::Callback> {
2517 let format = format.await?;
2518 let format = format.await?;
2518 let call: job::Callback = Box::new(move |editor, _compositor| {
2519 let call: job::Callback = Box::new(move |editor, _compositor| {
@@ -2523,11 +2524,25 @@ async fn make_format_callback(
2523 let scrolloff = editor.config().scrolloff;
2524 let scrolloff = editor.config().scrolloff;
2524 let doc = doc_mut!(editor, &doc_id);
2525 let doc = doc_mut!(editor, &doc_id);
2525 let view = view_mut!(editor);
2526 let view = view_mut!(editor);
2527+ let loader = editor.syn_loader.clone();
2528+
2526 if doc.version() == doc_version {
2529 if doc.version() == doc_version {
2527 apply_transaction(&format, doc, view);
2530 apply_transaction(&format, doc, view);
2528 doc.append_changes_to_history(view.id);
2531 doc.append_changes_to_history(view.id);
2529 doc.detect_indent_and_line_ending();
2532 doc.detect_indent_and_line_ending();
2530 view.ensure_cursor_in_view(doc, scrolloff);
2533 view.ensure_cursor_in_view(doc, scrolloff);
2534+
2535+ if let Some((path, force)) = write {
2536+ let refresh_lang = path.is_some();
2537+
2538+ if let Err(err) = doc.save(path, force) {
2539+ editor.set_error(format!("Error saving: {}", err));
2540+ } else if refresh_lang {
2541+ let id = doc.id();
2542+ doc.detect_language(loader);
2543+ let _ = editor.refresh_language_server(id);
2544+ }
2545+ }
2531 } else {
2546 } else {
2532 log::info!("discarded formatting changes because the document changed");
2547 log::info!("discarded formatting changes because the document changed");
2533 }
2548 }
helix-term/src/commands/typed.rs+19−16
@@ -267,30 +267,32 @@ fn write_impl(
267 path: Option<&Cow<str>>,
267 path: Option<&Cow<str>>,
268 force: bool,
268 force: bool,
269) -> anyhow::Result<()> {
269) -> anyhow::Result<()> {
270− let auto_format = cx.editor.config().auto_format;
270+ let editor_auto_fmt = cx.editor.config().auto_format;
271 let jobs = &mut cx.jobs;
271 let jobs = &mut cx.jobs;
272 let doc = doc_mut!(cx.editor);
272 let doc = doc_mut!(cx.editor);
273+ let path = path.map(AsRef::as_ref);
273
274
274 if doc.path().is_none() {
275 if doc.path().is_none() {
275 bail!("cannot write a buffer without a filename");
276 bail!("cannot write a buffer without a filename");
276 }
277 }
277− let fmt = if auto_format {
278+
279+ let fmt = if editor_auto_fmt {
278 doc.auto_format().map(|fmt| {
280 doc.auto_format().map(|fmt| {
279− let shared = fmt.shared();
280− let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
281+ let callback = make_format_callback(
282+ doc.id(),
283+ doc.version(),
284+ fmt,
285+ Some((path.map(Into::into), force)),
286+ );
287+
281 jobs.add(Job::with_callback(callback).wait_before_exiting());
288 jobs.add(Job::with_callback(callback).wait_before_exiting());
282− shared
283 })
289 })
284 } else {
290 } else {
285 None
291 None
286 };
292 };
287
293
288− doc.format_and_save(fmt, path.map(AsRef::as_ref), force)?;
294+ if fmt.is_none() {
289−
295+ doc.save(path, force)?;
290− if path.is_some() {
291− let id = doc.id();
292− doc.detect_language(cx.editor.syn_loader.clone());
293− let _ = cx.editor.refresh_language_server(id);
294 }
296 }
295
297
296 Ok(())
298 Ok(())
@@ -345,7 +347,7 @@ fn format(
345
347
346 let doc = doc!(cx.editor);
348 let doc = doc!(cx.editor);
347 if let Some(format) = doc.format() {
349 if let Some(format) = doc.format() {
348− let callback = make_format_callback(doc.id(), doc.version(), format);
350+ let callback = make_format_callback(doc.id(), doc.version(), format, None);
349 cx.jobs.callback(callback);
351 cx.jobs.callback(callback);
350 }
352 }
351
353
@@ -592,16 +594,17 @@ fn write_all_impl(
592
594
593 let fmt = if auto_format {
595 let fmt = if auto_format {
594 doc.auto_format().map(|fmt| {
596 doc.auto_format().map(|fmt| {
595− let shared = fmt.shared();
597+ let callback =
596− let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
598+ make_format_callback(doc.id(), doc.version(), fmt, Some((None, force)));
597 jobs.callback(callback);
599 jobs.callback(callback);
598− shared
599 })
600 })
600 } else {
601 } else {
601 None
602 None
602 };
603 };
603
604
605+ if fmt.is_none() {
604− doc.format_and_save::<_, PathBuf>(fmt, None, force)?;
606+ doc.save::<PathBuf>(None, force)?;
607+ }
605 }
608 }
606
609
607 if quit {
610 if quit {
helix-view/src/document.rs+1
@@ -14,6 +14,7 @@ use std::path::{Path, PathBuf};
14use std::str::FromStr;
14use std::str::FromStr;
15use std::sync::Arc;
15use std::sync::Arc;
16use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
16use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
17+
17use tokio::sync::Mutex;
18use tokio::sync::Mutex;
18
19
19use helix_core::{
20use helix_core::{