Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure cursor in view after format #4047

Merged
merged 3 commits into from
Oct 1, 2022
Merged

Ensure cursor in view after format #4047

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94baca1
ensure cursor in view after format
v4nderstruck Sep 30, 2022
268c8da
get mut doc without unwrap
v4nderstruck Oct 1, 2022
39979d1
Check for document before computing scrolloff
the-mikedavis Oct 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions helix-term/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2504,18 +2504,23 @@ async fn make_format_callback(
) -> anyhow::Result<job::Callback> {
let format = format.await?;
let call: job::Callback = Box::new(move |editor, _compositor| {
let view_id = view!(editor).id;
if let Some(doc) = editor.document_mut(doc_id) {
if doc.version() == doc_version {
doc.apply(&format, view_id);
doc.append_changes_to_history(view_id);
doc.detect_indent_and_line_ending();
if let Modified::SetUnmodified = modified {
doc.reset_modified();
}
} else {
log::info!("discarded formatting changes because the document changed");
if !editor.documents.contains_key(&doc_id) {
return;
}

let scrolloff = editor.config().scrolloff;
let doc = doc_mut!(editor, &doc_id);
the-mikedavis marked this conversation as resolved.
Show resolved Hide resolved
let view = view_mut!(editor);
if doc.version() == doc_version {
doc.apply(&format, view.id);
doc.append_changes_to_history(view.id);
doc.detect_indent_and_line_ending();
view.ensure_cursor_in_view(doc, scrolloff);
if let Modified::SetUnmodified = modified {
doc.reset_modified();
}
} else {
log::info!("discarded formatting changes because the document changed");
}
});
Ok(call)
Expand Down