andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make set_unmodified an enum.

Browse Source
This commit is contained in:
Joe Neeman 2021-06-29 22:52:09 -05:00 committed by Blaž Hrastnik
parent 2902a10a3e
commit b39e452d77
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
helix-term/src/commands.rs
View File

@ -1162,7 +1162,12 @@ fn write_impl<P: AsRef<Path>>(
} }
let fmt = doc.auto_format().map(|fmt| { let fmt = doc.auto_format().map(|fmt| {
let shared = fmt.shared(); let shared = fmt.shared();
let callback = make_format_callback(doc.id(), doc.version(), true, shared.clone()); let callback = make_format_callback(
doc.id(),
doc.version(),
Modified::SetUnmodified,
shared.clone(),
);
jobs.callback(callback); jobs.callback(callback);
shared shared
}); });
@ -1187,7 +1192,8 @@ fn format(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
let (_, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
if let Some(format) = doc.format() { if let Some(format) = doc.format() {
let callback = make_format_callback(doc.id(), doc.version(), false, format); let callback =
make_format_callback(doc.id(), doc.version(), Modified::LeaveModified, format);
cx.jobs.callback(callback); cx.jobs.callback(callback);
} }
} }
@ -1907,6 +1913,13 @@ fn append_to_line(cx: &mut Context) {
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
} }
/// Sometimes when applying formatting changes we want to mark the buffer as unmodified, for
/// example because we just applied the same changes while saving.
enum Modified {
SetUnmodified,
LeaveModified,
}
// Creates an LspCallback that waits for formatting changes to be computed. When they're done, // Creates an LspCallback that waits for formatting changes to be computed. When they're done,
// it applies them, but only if the doc hasn't changed. // it applies them, but only if the doc hasn't changed.
// //
@ -1915,7 +1928,7 @@ fn append_to_line(cx: &mut Context) {
async fn make_format_callback( async fn make_format_callback(
doc_id: DocumentId, doc_id: DocumentId,
doc_version: i32, doc_version: i32,
set_unmodified: bool, modified: Modified,
format: impl Future<Output = helix_lsp::util::LspFormatting> + Send + 'static, format: impl Future<Output = helix_lsp::util::LspFormatting> + Send + 'static,
) -> anyhow::Result<job::Callback> { ) -> anyhow::Result<job::Callback> {
let format = format.await; let format = format.await;
@ -1925,7 +1938,7 @@ async fn make_format_callback(
if doc.version() == doc_version { if doc.version() == doc_version {
doc.apply(&Transaction::from(format), view_id); doc.apply(&Transaction::from(format), view_id);
doc.append_changes_to_history(view_id); doc.append_changes_to_history(view_id);
if set_unmodified { if let Modified::SetUnmodified = modified {
doc.reset_modified(); doc.reset_modified();
} }
} else { } else {