fixed cursor location when undoing

Nimaoth · Mar 14, 2024 · f88653c · f88653c
1 parent 4be42b8
commit f88653c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/config/absytree_config_wasm.wasm b/config/absytree_config_wasm.wasm
diff --git a/scripting/absytree_internal.nim b/scripting/absytree_internal.nim
@@ -82,10 +82,10 @@ proc editor_text_indent_void_TextDocumentEditor_impl*(self: TextDocumentEditor)
 proc editor_text_unindent_void_TextDocumentEditor_impl*(self: TextDocumentEditor) =
   discard
 proc editor_text_undo_void_TextDocumentEditor_string_impl*(
-    self: TextDocumentEditor; checkpoint: string = "move") =
+    self: TextDocumentEditor; checkpoint: string = "word") =
   discard
 proc editor_text_redo_void_TextDocumentEditor_string_impl*(
-    self: TextDocumentEditor; checkpoint: string = "move") =
+    self: TextDocumentEditor; checkpoint: string = "word") =
   discard
 proc editor_text_addNextCheckpoint_void_TextDocumentEditor_string_impl*(
     self: TextDocumentEditor; checkpoint: string) =

diff --git a/scripting/absytree_internal_wasm.nim b/scripting/absytree_internal_wasm.nim
@@ -55,9 +55,9 @@ proc editor_text_insertText_void_TextDocumentEditor_string_bool_impl(
 proc editor_text_indent_void_TextDocumentEditor_impl(self: TextDocumentEditor)  {.importc.}
 proc editor_text_unindent_void_TextDocumentEditor_impl(self: TextDocumentEditor)  {.importc.}
 proc editor_text_undo_void_TextDocumentEditor_string_impl(
-    self: TextDocumentEditor; checkpoint: string = "move")  {.importc.}
+    self: TextDocumentEditor; checkpoint: string = "word")  {.importc.}
 proc editor_text_redo_void_TextDocumentEditor_string_impl(
-    self: TextDocumentEditor; checkpoint: string = "move")  {.importc.}
+    self: TextDocumentEditor; checkpoint: string = "word")  {.importc.}
 proc editor_text_addNextCheckpoint_void_TextDocumentEditor_string_impl(
     self: TextDocumentEditor; checkpoint: string)  {.importc.}
 proc editor_text_printUndoHistory_void_TextDocumentEditor_int_impl(

diff --git a/scripting/editor_text_api.nim b/scripting/editor_text_api.nim
@@ -83,9 +83,9 @@ proc indent*(self: TextDocumentEditor) =
   editor_text_indent_void_TextDocumentEditor_impl(self)
 proc unindent*(self: TextDocumentEditor) =
   editor_text_unindent_void_TextDocumentEditor_impl(self)
-proc undo*(self: TextDocumentEditor; checkpoint: string = "move") =
+proc undo*(self: TextDocumentEditor; checkpoint: string = "word") =
   editor_text_undo_void_TextDocumentEditor_string_impl(self, checkpoint)
-proc redo*(self: TextDocumentEditor; checkpoint: string = "move") =
+proc redo*(self: TextDocumentEditor; checkpoint: string = "word") =
   editor_text_redo_void_TextDocumentEditor_string_impl(self, checkpoint)
 proc addNextCheckpoint*(self: TextDocumentEditor; checkpoint: string) =
   editor_text_addNextCheckpoint_void_TextDocumentEditor_string_impl(self,

diff --git a/scripting/editor_text_api_wasm.nim b/scripting/editor_text_api_wasm.nim
@@ -533,7 +533,7 @@ proc unindent*(self: TextDocumentEditor) =
 
 proc editor_text_undo_void_TextDocumentEditor_string_wasm(arg: cstring): cstring {.
     importc.}
-proc undo*(self: TextDocumentEditor; checkpoint: string = "move") =
+proc undo*(self: TextDocumentEditor; checkpoint: string = "word") =
   var argsJson = newJArray()
   argsJson.add block:
     when TextDocumentEditor is JsonNode:
@@ -552,7 +552,7 @@ proc undo*(self: TextDocumentEditor; checkpoint: string = "move") =
 
 proc editor_text_redo_void_TextDocumentEditor_string_wasm(arg: cstring): cstring {.
     importc.}
-proc redo*(self: TextDocumentEditor; checkpoint: string = "move") =
+proc redo*(self: TextDocumentEditor; checkpoint: string = "word") =
   var argsJson = newJArray()
   argsJson.add block:
     when TextDocumentEditor is JsonNode:

diff --git a/src/text/text_document.nim b/src/text/text_document.nim
@@ -1006,9 +1006,11 @@ proc undo*(self: TextDocument, oldSelection: openArray[Selection], useOldSelecti
   if self.undoOps.len == 0:
     return
 
+  result = some @oldSelection
+
   while self.undoOps.len > 0:
     let op = self.undoOps.pop
-    result = self.doUndo(op, oldSelection, useOldSelection, self.redoOps).some
+    result = self.doUndo(op, result.get, useOldSelection, self.redoOps).some
     if untilCheckpoint.len == 0 or untilCheckpoint in op.checkpoints:
       break
 
@@ -1041,9 +1043,11 @@ proc redo*(self: TextDocument, oldSelection: openArray[Selection], useOldSelecti
   if self.redoOps.len == 0:
     return
 
+  result = some @oldSelection
+
   while self.redoOps.len > 0:
     let op = self.redoOps.pop
-    result = self.doRedo(op, oldSelection, useOldSelection, self.undoOps).some
+    result = self.doRedo(op, result.get, useOldSelection, self.undoOps).some
     if untilCheckpoint.len == 0 or (self.redoOps.len > 0 and untilCheckpoint in self.redoOps.last.checkpoints):
       break