[EGIT] [tools/enventor] master 01/01: redoundo: fix abnormal behavior of smart redoundo

[YeongJong Lee]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=8b55d776da3440a8096e26e9b194469bd8f8c38e

commit 8b55d776da3440a8096e26e9b194469bd8f8c38e
Author: YeongJong Lee <clean...@naver.com>
Date:   Tue May 23 10:14:19 2017 +0900

    redoundo: fix abnormal behavior of smart redoundo
    
    Summary:
    1. When delete text
    2. When add some separated text on the same line ex) aaaa -> abbaacca
    ,the smart redoundo is broken
    
    This fixes that bugs
    
    Test Plan:
    1. turn on smart redo / undo option
    1. add / delete text
    2. check that smart redoundo works correctly
    
    Reviewers: Jaehyun_Cho
    
    Reviewed By: Jaehyun_Cho
    
    Differential Revision: https://phab.enlightenment.org/D4880
---
 src/lib/redoundo.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/lib/redoundo.c b/src/lib/redoundo.c
index 3762452..94c866b 100644
--- a/src/lib/redoundo.c
+++ b/src/lib/redoundo.c
@@ -63,6 +63,7 @@ _input_timer_cb(void *data)
 static diff_data *
 smart_analyser(redoundo_data *rd, diff_data *diff)
 {
+   Eina_Bool is_continues_text = EINA_FALSE;
    if (!enventor_obj_smart_undo_redo_get(rd->enventor)) return diff;
 
    if (rd->smart.timer)
@@ -73,21 +74,43 @@ smart_analyser(redoundo_data *rd, diff_data *diff)
 
    if (!diff) return diff;
 
+   if (!rd->last_diff || (rd->last_diff->action != diff->action))
+     {
+        rd->smart.continues_input = EINA_TRUE;
+        return diff;
+     }
+
    if (diff->length == 1 && enventor_obj_auto_indent_get(rd->enventor))
      {
        if (strstr(diff->text, "<br/>")) diff->relative = EINA_TRUE;
          else diff->relative = EINA_FALSE;
      }
 
+   // Determine the text of diff is continuous
+   if (diff->action ?
+       ((rd->last_diff->cursor_pos + rd->last_diff->length) == 
diff->cursor_pos) :
+       ((diff->cursor_pos + diff->length) == rd->last_diff->cursor_pos) ||
+       (diff->cursor_pos == rd->last_diff->cursor_pos))
+     is_continues_text = EINA_TRUE;
+
    // Analyse speed of text input and words separates
    if ((rd->smart.continues_input) && (!diff->relative) &&
-       (isalpha(diff->text[0])) && (rd->last_diff && 
(isalpha(rd->last_diff->text[0]))))
+       (isalpha(diff->text[0])) && (isalpha(rd->last_diff->text[0])) &&
+       (is_continues_text))
      {
         diff_data *tmp = diff;
         const char *text;
         diff = rd->last_diff;
         diff->length += tmp->length;
-        text = eina_stringshare_printf("%s%s", diff->text, tmp->text);
+
+        if (diff->action || (diff->cursor_pos == tmp->cursor_pos))
+          text = eina_stringshare_printf("%s%s", diff->text, tmp->text);
+        else
+          {
+             diff->cursor_pos = tmp->cursor_pos;
+             text = eina_stringshare_printf("%s%s", tmp->text, diff->text);
+          }
+
         eina_stringshare_replace(&diff->text, text);
         eina_stringshare_del(text);
         rd->last_diff = eina_list_data_get(eina_list_prev(rd->current_node));

--