pass all tests for 'j' motion

fcore/normal-mode/normal-move.sml

@@ -277,11 +277,16 @@ struct
           val lineIdx = LineGap.lineNumberToIdx (newCursorLineNumber, buffer)
           val buffer = LineGap.goToIdx (lineIdx, buffer)
         in
-          if lineIdx >= #textLength buffer then
+          if lineIdx >= #textLength buffer - 1 then
             (* we reached last line *)
             let
               val lineIdx = Int.max (#textLength buffer - 1, 0)
               val buffer = LineGap.goToIdx (lineIdx, buffer)
+
+              val lineIdx =
+                if Cursor.isOnNewlineAfterChr (buffer, lineIdx) then lineIdx - 1
+                else lineIdx
+
               val startOfLine = Cursor.vi0 (buffer, lineIdx)
             in
               if cursorIdx >= startOfLine then
@@ -292,12 +297,6 @@ struct
                 finishMoveCursorUpDown
                   (app, newCursorLineNumber, buffer, column, startOfLine)
             end
-          else if lineIdx = #textLength buffer - 1 then
-            (* last line in buffer ends with \n
-             * and we just reached it *)
-            let val () = print "296\n"
-            in raise Fail ""
-            end
           else
             let
               val lineIdx =

test/normal-move.sml

@@ -463,7 +463,7 @@ struct
              val {cursorIdx, ...} = TestUtils.updateMany (app, "2j")
 
              (* assert *)
-             val expectedIdx = initialCursorIdx
+             val expectedIdx = 6
            in
              Expect.isTrue (cursorIdx = expectedIdx)
            end)