Apply external command formatting if buffer has changed while computing it

2023-03-01 10:17:04 -08:00
parent 368d2a73ea
commit 70cb2fa8d7
3 changed files with 18 additions and 32 deletions
@@ -2921,7 +2921,7 @@ impl Project {
                        buffer.finalize_last_transaction();
                        buffer.start_transaction();
                        if let Some(diff) = trailing_whitespace_diff {
-                            buffer.apply_non_conflicting_portion_of_diff(diff, cx);
+                            buffer.apply_diff(diff, cx);
                        }
                        if ensure_final_newline {
                            buffer.ensure_final_newline(cx);