enhance undo/redo archiver

Author: JimZhouZZY

src/Data/History/archiver.cpp

@@ -330,7 +330,7 @@ archiver_rep::confirm () {
       if (depth <= last_save) last_save= -1;
       if (depth <= last_autosave) last_autosave= -1;
       normalize ();
-      // show_all ();
+      show_all ();
     }
   }
 }
@@ -688,23 +688,131 @@ archiver_rep::reconstruct_from_state (tree old_state, tree new_state, path p, st
 
   if (!trees_equal) {
     modification mod = compute_tree_diff(old_state, new_state, p, completion);
+    cout << "modification: " << mod << LF;
+    
+    //modification cursor_mod = compute_cursor_update(old_state, new_state, p, mod);
+    //cout << "cursor modification: " << cursor_mod << LF;
+    
+    the_et = old_state;
     add (mod);
-  } else {
+    the_et = new_state;
+    //if (cursor_mod != mod_insert(path(), 0, "")) { // Check if cursor update is needed
+      //add (cursor_mod);
+    //}
   }
   confirm ();
   simplify ();
 }
 
 modification
 archiver_rep::compute_tree_diff (tree old_tree, tree new_tree, path p, string completion) {
-  // TODO: refactor
   cout << "compute_tree_diff: path=" << p << "\n";
-  string old_s =as_string(subtree(old_tree, path_up(p, 1)));
+  
+  string old_s = as_string(subtree(old_tree, path_up(p, 1)));
   string new_s = as_string(subtree(new_tree, path_up(p, 1)));
+  
+  SI i = 0;
+  SI j = 0;
+  
+  // Find common prefix
+  while (i < N(old_s) && i < N(new_s) && old_s[i] == new_s[i]) {
+    i++;
+  }
+  
+  // Find common suffix (but don't overlap with prefix)
+  while (j < (N(old_s) - i) && j < (N(new_s) - i) && 
+         old_s[N(old_s) - 1 - j] == new_s[N(new_s) - 1 - j]) {
+    j++;
+  }
+
+  // Calculate the different parts
+  SI old_start = i;
+  SI old_end = N(old_s) - j;
+  SI new_start = i;
+  SI new_end = N(new_s) - j;
+  
+  string old_diff = (old_end > old_start) ? old_s(old_start, old_end) : "";
+  string new_diff = (new_end > new_start) ? new_s(new_start, new_end) : "";
+  
+  cout << "old_s=\"" << old_s << "\", new_s=\"" << new_s << "\"\n";
+  cout << "old_diff=\"" << old_diff << "\", new_diff=\"" << new_diff << "\"\n";
+  cout << "prefix_len=" << i << ", suffix_len=" << j << "\n";
+  
   int insert_pos = last_item(p);
-  string insert_content = completion;
-  //cout << "compute_tree_diff: old_s=\"" << old_s << "\", new_s=\"" << new_s
-  //     << "\", insert_pos=" << insert_pos
-  //     << ", insert_content=\"" << insert_content << "\"\n";
-  return mod_insert (path_up(p, 1), insert_pos, insert_content);
+  
+  // Determine the operation based on the differences
+  if (old_diff == "" && new_diff != "") {
+    // Pure insertion
+    cout << "Pure insertion detected\n";
+    return mod_insert(path_up(p, 1), i, new_diff);
+  }
+  else if (old_diff != "" && new_diff == "") {
+    // Pure deletion  
+    cout << "Pure deletion detected\n";
+    // For deletion, the position should be relative to the new string
+    // Since we deleted from old_start to old_end, the deletion position
+    // in the context of the new string is at position i (common prefix length)
+    return mod_remove(path_up(p, 1), i, N(old_diff));
+  }
+  else if (old_diff != "" && new_diff != "") {
+    // Replacement (remove old, then insert new)
+    // For simplicity, we'll use insert with the new content at position i
+    cout << "Replacement detected, using insert\n";
+    return mod_insert(path_up(p, 1), i, new_diff);
+  }
+  else {
+    // No diff
+    cout << "No difference detected\n";
+    return mod_insert(path_up(p, 1), insert_pos, "");
+  }
+}
+
+modification
+archiver_rep::compute_cursor_update (tree old_tree, tree new_tree, path p, modification content_mod) {
+  cout << "compute_cursor_update: path=" << p << ", content_mod=" << content_mod << "\n";
+  int current_pos = last_item(p);
+  int new_cursor_pos = current_pos;
+  switch (content_mod->k) {
+    case MOD_INSERT: {
+      string inserted_text = as_string(content_mod->t);
+      int insert_pos = last_item(content_mod->p);
+      
+      if (current_pos >= insert_pos) {
+        // Cursor was at or after the insertion point, move it forward
+        new_cursor_pos = current_pos + N(inserted_text);
+      }
+      break;
+    }
+    
+    case MOD_REMOVE: {
+      int remove_pos = last_item(path_up(content_mod->p, 1));
+      int remove_count = last_item(content_mod->p);
+      cout << "remove_pos=" << remove_pos << ", remove_count=" << remove_count << "\n";
+      
+      if (current_pos > remove_pos + remove_count) {
+        // Cursor was after the removed content, move it back
+        new_cursor_pos = current_pos - remove_count;
+      }
+      else if (current_pos > remove_pos) {
+        // Cursor was within the removed content, place it at the removal point
+        new_cursor_pos = remove_pos;
+      }
+      break;
+    }
+    
+    default:
+      break;
+  }
+  
+  cout << "cursor position: " << current_pos << " -> " << new_cursor_pos << "\n";
+  
+  if (new_cursor_pos != current_pos) {
+    path cursor_path = path_up(p, 1);
+    // Create appropriate cursor data tree
+    tree cursor_data = compound("author", "1");
+    return mod_set_cursor(cursor_path, new_cursor_pos, cursor_data);
+  }
+  
+  // empty modification
+  return mod_insert(path(), 0, "");
 }

src/Data/History/archiver.hpp

@@ -73,6 +73,7 @@ class archiver_rep : public concrete_struct {
 
   void reconstruct_from_state (tree old_state, tree new_state, path p, string completion);
   modification compute_tree_diff (tree old_tree, tree new_tree, path p, string completion);
+  modification compute_cursor_update (tree old_tree, tree new_tree, path p, modification content_mod);
   bool is_content_modification (patch p);
 
   inline void set_versioning (bool v) { versioning= v; }

src/Edit/Interface/edit_complete.cpp

@@ -172,12 +172,14 @@ edit_interface_rep::complete_start (string prefix, array<string> compls) {
     set_arch_versioning (true);
     insert_tree (completions[0]);
 
+    if (get_input_mode() != INPUT_COMPLETE) {
+      complete_et = copy (et);
+      complete_tp = copy (tp);
+      complete_str= completions[0];
+    }
     complete_message ();
     // beep ();
     set_input_mode (INPUT_COMPLETE);
-    complete_et = copy (et);
-    complete_tp = copy (tp);
-    complete_str= completions[0];
   }
 }
 
@@ -186,7 +188,7 @@ edit_interface_rep::complete_keypress (string key) {
   int    end  = last_item (tp);
   string old_s= completions[completion_pos];
   string new_s= "";
-  string test = completion_prefix * old_s;
+  string full_s = completion_prefix * old_s;
   set_message ("", "");
   cout << "complete_keypress: " << key << LF;
   if (key == "space") key= " ";
@@ -204,11 +206,11 @@ edit_interface_rep::complete_keypress (string key) {
     SERVER (set_completion_popup_visible (false));
     return false;
   }
-  //else if (key == "backspace" && N(completion_prefix) == 1) {
+  //else if (key == "backspace" && N(full_s) == 1) {
   //  complete_str = string("");
   //  set_input_normal ();
   //  SERVER (set_completion_popup_visible (false));
-  //  return false;
+  //  return true;
   //}
   else if ((key != "tab") && (key != "S-tab") && (key != "up") &&
            (key != "down")) {
@@ -224,7 +226,7 @@ edit_interface_rep::complete_keypress (string key) {
     set_input_normal ();
     return false;
   }
-  if ((end < N (test)) || (s (end - N (test), end) != test)) {
+  if ((end < N (full_s)) || (s (end - N (full_s), end) != full_s)) {
     set_input_normal ();
     return false;
   }
@@ -317,6 +319,7 @@ edit_interface_rep::custom_complete (tree r) {
   // cout << prefix << ", " << compls << LF;
 
   if ((prefix == "") || (N (compls) <= 1)) {
+    complete_str = string("");
     set_input_normal ();
     SERVER (set_completion_popup_visible (false));
     return;

src/Edit/Interface/edit_interface.cpp

@@ -92,6 +92,7 @@ edit_interface_rep::suspend () {
     set_message ("", "", false);
   }
   got_focus = false;
+  set_input_normal ();
   env_change= env_change & (~THE_FREEZE);
   notify_change (THE_FOCUS);
   if (shadow != NULL) tm_delete (shadow);