diff options
| -rw-r--r-- | helix-term/src/commands.rs | 5 | ||||
| -rw-r--r-- | helix-term/src/commands/typed.rs | 35 |
2 files changed, 32 insertions, 8 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index c5ee72d2..e44b851e 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -2515,19 +2515,20 @@ fn insert_at_line_end(cx: &mut Context) { async fn make_format_callback( doc_id: DocumentId, doc_version: i32, + view_id: ViewId, 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 = Callback::Editor(Box::new(move |editor| { - if !editor.documents.contains_key(&doc_id) { + if !editor.documents.contains_key(&doc_id) || !editor.tree.contains(view_id) { return; } let scrolloff = editor.config().scrolloff; let doc = doc_mut!(editor, &doc_id); - let view = view_mut!(editor); + let view = view_mut!(editor, view_id); if let Ok(format) = format { if doc.version() == doc_version { diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index 394c0733..7ea4c801 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -271,7 +271,7 @@ fn write_impl( ) -> anyhow::Result<()> { let editor_auto_fmt = cx.editor.config().auto_format; let jobs = &mut cx.jobs; - let doc = doc_mut!(cx.editor); + let (view, doc) = current!(cx.editor); let path = path.map(AsRef::as_ref); let fmt = if editor_auto_fmt { @@ -279,6 +279,7 @@ fn write_impl( let callback = make_format_callback( doc.id(), doc.version(), + view.id, fmt, Some((path.map(Into::into), force)), ); @@ -344,9 +345,9 @@ fn format( return Ok(()); } - let doc = doc!(cx.editor); + let (view, doc) = current!(cx.editor); if let Some(format) = doc.format() { - let callback = make_format_callback(doc.id(), doc.version(), format, None); + let callback = make_format_callback(doc.id(), doc.version(), view.id, format, None); cx.jobs.callback(callback); } @@ -568,12 +569,13 @@ pub fn write_all_impl( let mut errors: Vec<&'static str> = Vec::new(); let auto_format = cx.editor.config().auto_format; let jobs = &mut cx.jobs; + let current_view = view!(cx.editor); // save all documents let saves: Vec<_> = cx .editor .documents - .values() + .values_mut() .filter_map(|doc| { if !doc.is_modified() { return None; @@ -585,10 +587,30 @@ pub fn write_all_impl( return None; } + // Look for a view to apply the formatting change to. If the document + // is in the current view, just use that. Otherwise, since we don't + // have any other metric available for better selection, just pick + // the first view arbitrarily so that we still commit the document + // state for undos. If somehow we have a document that has not been + // initialized with any view, initialize it with the current view. + let target_view = if doc.selections().contains_key(¤t_view.id) { + current_view.id + } else if let Some(view) = doc.selections().keys().next() { + *view + } else { + doc.ensure_view_init(current_view.id); + current_view.id + }; + let fmt = if auto_format { doc.auto_format().map(|fmt| { - let callback = - make_format_callback(doc.id(), doc.version(), fmt, Some((None, force))); + let callback = make_format_callback( + doc.id(), + doc.version(), + target_view, + fmt, + Some((None, force)), + ); jobs.add(Job::with_callback(callback).wait_before_exiting()); }) } else { @@ -598,6 +620,7 @@ pub fn write_all_impl( if fmt.is_none() { return Some(doc.id()); } + None }) .collect(); |