From 222a9aa43cd00601950c222fe66ec88fa264f735 Mon Sep 17 00:00:00 2001
From: Humza Shahid <humzasaur@gmail.com>
Date: Wed, 24 Sep 2025 09:46:28 +0100
Subject: [PATCH] fix 'MakeNormalDelete.removeChr' by accounting for case when
 we are deleting from last line but the last line does not end with its own
 newline

---
 fcore/normal-mode/make-normal-delete.sml | 30 ++++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/fcore/normal-mode/make-normal-delete.sml b/fcore/normal-mode/make-normal-delete.sml
index 5eb7667..8e5b20b 100644
--- a/fcore/normal-mode/make-normal-delete.sml
+++ b/fcore/normal-mode/make-normal-delete.sml
@@ -51,7 +51,9 @@ struct
            * beyond current line's length,
           *  then clip the length, to ensure we don't delete the newline *)
           val high = cursorIdx + count
-          val high = Int.min (lineEnd - 1, high)
+          val high =
+            if Cursor.isOnNewlineAfterChr (buffer, lineEnd) then lineEnd
+            else Int.min (lineEnd - 1, high)
           val length = high - cursorIdx
 
           val initialMsg = Fn.initMsgs (cursorIdx, length, buffer)
@@ -62,16 +64,24 @@ struct
           val lineEndAfterDelete = Cursor.viDlr (buffer, lineStart, 1)
 
           val cursorIdx = Int.min (lineEndAfterDelete, cursorIdx)
-
-          val buffer = LineGap.goToIdx (cursorIdx, buffer)
-          val cursorIdx =
-            if Cursor.isOnNewlineAfterChr (buffer, cursorIdx) then
-              if cursorIdx < #textLength buffer - 1 then cursorIdx + 1
-              else cursorIdx - 1
-            else
-              cursorIdx
         in
-          finishAfterDeletingBuffer (app, cursorIdx, buffer, time, initialMsg)
+          if cursorIdx >= #textLength buffer - 1 then
+            (* special case: when buffer does not end with newline
+             * and we are deleting from the last line *)
+            let
+              val cursorIdx = #textLength buffer - 1
+              val buffer = LineGap.goToIdx (cursorIdx, buffer)
+              val cursorIdx =
+                if Cursor.isOnNewlineAfterChr (buffer, cursorIdx) then
+                  cursorIdx - 1
+                else
+                  cursorIdx
+            in
+              finishAfterDeletingBuffer
+                (app, cursorIdx, buffer, time, initialMsg)
+            end
+          else
+            finishAfterDeletingBuffer (app, cursorIdx, buffer, time, initialMsg)
         end
     end