fix bugs in implementing and using text buffer. Some functions did not save the drawMsg to the app's state, which we means we didn't draw in those cases. The text builder functions also drew cursors on characters even when the cursor is not at this position. Both of these bugs are fixed.

fcore/normal-mode/make-normal-delete.sml

@@ -520,8 +520,8 @@ struct
       val {buffer, cursorIdx, searchString, ...} = app
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
 
-      val low = Cursor.prevWordStrict (buffer, cursorIdx, 1)
+      val low = Cursor.prevWORDStrict (buffer, cursorIdx, 1)
-      val high = Cursor.endOfWordStrict (buffer, cursorIdx, 1) + 1
+      val high = Cursor.endOfWORDStrict (buffer, cursorIdx, 1) + 1
 
       val buffer = LineGap.goToIdx (high, buffer)
       val length = high - low

fcore/normal-mode/normal-finish.sml

@@ -41,7 +41,7 @@ struct
         )
       val drawMsg = Vector.concat drawMsg
       val drawMsg = DRAW_TEXT drawMsg
-      val drawMsg = [DRAW drawMsg]
+      val msgs = DRAW drawMsg :: msgs
 
       val mode = NORMAL_MODE ""
     in
@@ -91,7 +91,7 @@ struct
 
       val newBuffer = LineGap.goToIdx (cursorIdx, buffer)
       val visualScrollColumn =
-        TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth)
+        TextScroll.getScrollColumn (buffer, cursorIdx, newWidth)
       val newBuffer = LineGap.goToLine (startLine, newBuffer)
       val lineIdx = TextBuilderUtils.getLineAbsIdxFromBuffer (startLine, buffer)
 
@@ -99,15 +99,15 @@ struct
         ( startLine
         , cursorIdx
         , buffer
-        , windowWidth
+        , newWidth
-        , windowHeight
+        , newHeight
         , searchList
         , searchString
         , visualScrollColumn
         )
       val drawMsg = Vector.concat drawMsg
       val drawMsg = DRAW_TEXT drawMsg
-      val drawMsg = [DRAW drawMsg]
+      val msgs = [DRAW drawMsg]
     in
       NormalModeWith.bufferAndSize
         ( app
@@ -115,7 +115,7 @@ struct
         , newWidth
         , newHeight
         , searchList
-        , drawMsg
+        , msgs
         , bufferModifyTime
         , visualScrollColumn
         )
@@ -159,7 +159,7 @@ struct
         )
       val drawMsg = Vector.concat drawMsg
       val drawMsg = DRAW_TEXT drawMsg
-      val drawMsg = [DRAW drawMsg]
+      val msgs = DRAW drawMsg :: initialMsg
 
       val mode = NORMAL_MODE ""
     in
@@ -170,7 +170,7 @@ struct
         , mode
         , startLine
         , searchList
-        , drawMsg
+        , msgs
         , bufferModifyTime
         , visualScrollColumn
         )

fcore/normal-mode/normal-move.sml

@@ -84,7 +84,7 @@ struct
 
       val drawMsg = NormalModeTextBuilder.build
         ( bufferLine
-        , lineIdx
+        , bufferIdx
         , buffer
         , windowWidth
         , windowHeight

fcore/text-builder/normal-mode-text-builder.sml

@@ -27,7 +27,6 @@ struct
             (* get relative index of line to start building from *)
             val strPos =
               Utils.getRelativeLineStartFromRightHead (startLine, curLine, lhd)
-              + 1
             (* get absolute idx of line *)
             val absIdx = curIdx + strPos
             val searchPos = BinSearch.equalOrMore (absIdx, searchList)

fcore/text-builder/text-builder-with-cursor.sml

@@ -207,8 +207,7 @@ struct
                 in Utils.makeCursorOnChr (chr, posX, posY, env) :: acc
                 end
               else
-                Utils.makeChr (chr, posX, posY, env)
+                Utils.makeChr (chr, posX, posY, env) :: acc
-                :: Utils.makeCursor (posX, posY, env) :: acc
           in
             build
               ( pos + 1

fcore/text-builder/text-builder-with-highlight.sml

@@ -270,8 +270,8 @@ struct
               let
                 val acc =
                   if absIdx = cursorIdx then
-                    Utils.makeCursor (posX, posY, env)
+                    Utils.makeCursorOnChr (chr, posX, posY, env)
-                    :: Utils.makeCursorOnChr (chr, posX, posY, env) :: acc
+                    :: Utils.makeCursor (posX, posY, env) :: acc
                   else if Utils.isInSearchRange (absIdx, searchPos, env) then
                     Utils.makeHighlightChr (chr, posX, posY, env)
                     :: Utils.makeHighlight (posX, posY, env) :: acc