From 6566350276aa12cab3537f6c55f76f7967c12302 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 12 Dec 2023 09:52:22 -0700 Subject: [PATCH] ViEditor::finish_change will store change to history --- src/edit/vi.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/edit/vi.rs b/src/edit/vi.rs index 1ac3a94..b4ffd85 100644 --- a/src/edit/vi.rs +++ b/src/edit/vi.rs @@ -28,16 +28,17 @@ fn finish_change( editor: &mut E, commands: &mut cosmic_undo_2::Commands, changed: &mut bool, -) { +) -> Option { //TODO: join changes together match editor.finish_change() { Some(change) => { if !change.items.is_empty() { - commands.push(change); + commands.push(change.clone()); *changed = true; } + Some(change) } - None => {} + None => None, } } @@ -319,7 +320,7 @@ impl<'a> Edit for ViEditor<'a> { } fn finish_change(&mut self) -> Option { - self.editor.finish_change() + finish_change(&mut self.editor, &mut self.commands, &mut self.changed) } fn action(&mut self, font_system: &mut FontSystem, action: Action) {