Editing keeps only the last change most of the time

[sergiogarciadev]

When editing a file, in the following scenarios all previous changes are lost due to a call to app.hex_view.changed_bytes.clear():

• When pressing Esc
• When editing zeroing the data with z
• When incrementing a byte with Ctrl + a
• When decreamenting a byte with Ctrl + x

If this is an intended behavior, please just close this issue.

[merces]

You mean by pressing Esc after you've made changes? If so, this is to cancel the changes yes. While Enter confirms the changes to the buffer, Esc cancels them. But you raised an interesting point.. this doesn't happen in vim. When we implement the undo feature, maybe it makes sense to get rid of this behavior.

[sergiogarciadev]

Please check the following recording:

First I edited a few lines, confirmed the edit with Enter. Then when edit the line at offset 0x20 I hit Esc but the already confirmed changes where lost.

Same happens when making new edits with z, Ctrl + a and Ctrl + x, the already confirmed changes are lost.

The expected behavior should just cancel the last edit with Esc and do not change previous edit with other commands.

[merces]

I see. That's indeed a bug then. 🫠

While fixing this, maybe we should have dz6 working like Vim. In this case, r would enter replace mode, then Esc would lead back to normal mode. Then, u could undo the changes step by step.

[merces]

Hey @sergiogarciadev, could you check https://github.com/mentebinaria/dz6/tree/feature/undo ? I believe it fixes this issue, but it needs some improvements still. It doesn't work with nibbles, for example.

[sergiogarciadev]

This works pretty well, but there it stills clear the changes on z, Ctrl+a and Ctrl+x when in NORMAL mode. It is just a matter of removing the app.hex_view.changed_bytes.clear(); as show below:

--- a/src/hex/events.rs
+++ b/src/hex/events.rs
@@ -172,7 +172,6 @@ pub fn hex_mode_events(app: &mut App, key: KeyEvent) -> Result<bool> {
         KeyCode::Char('z') => {
             if !app.file_info.is_read_only && app.hex_view.offset < app.file_info.size {
                 app.state = UIState::HexEditing;
-                app.hex_view.changed_bytes.clear();
                 hex::edit::fill_with(app, 0x00, true);
             }
         }
@@ -184,7 +183,6 @@ pub fn hex_mode_events(app: &mut App, key: KeyEvent) -> Result<bool> {
                 && key.modifiers.contains(KeyModifiers::CONTROL)
             {
                 app.state = UIState::HexEditing;
-                app.hex_view.changed_bytes.clear();
                 let ofs = app.hex_view.offset;
                 if let Some(s) = app.hex_view.changed_bytes.get(&ofs) {
                     if let Ok(b) = u8::from_str_radix(s, 16) {
@@ -203,7 +201,6 @@ pub fn hex_mode_events(app: &mut App, key: KeyEvent) -> Result<bool> {
                 && key.modifiers.contains(KeyModifiers::CONTROL)
             {
                 app.state = UIState::HexEditing;
-                app.hex_view.changed_bytes.clear();
                 let ofs = app.hex_view.offset;
                 if let Some(s) = app.hex_view.changed_bytes.get(&ofs) {
                     if let Ok(b) = u8::from_str_radix(s, 16) {