reimplement vi's 'l' motion so that we only skip a newline when it is preceded by a non-newline character

2025-09-21 17:49:30 +01:00
parent 639f71009c
commit d63201ada7
5 changed files with 59 additions and 9 deletions
--- a/fcore/text-builder/text-builder-with-cursor.sml
+++ b/fcore/text-builder/text-builder-with-cursor.sml
@@ -137,8 +137,6 @@ struct
            acc
          else
            let
-              val posX = #startX env
-              val posY = posY + TC.ySpace
              val acc =
                if absIdx = cursorIdx then
                  Utils.makeCursor (posX, posY, env) :: acc
@@ -151,8 +149,8 @@ struct
                , stl
                , line
                , ltl
-                , posX
-                , posY
+                , #startX env
+                , posY + TC.ySpace
                , 0
                , lineNumber + 1
                , absIdx + 1
--- a/fcore/text-builder/text-builder-with-highlight.sml
+++ b/fcore/text-builder/text-builder-with-highlight.sml
@@ -234,8 +234,6 @@ struct
                acc
              else
                let
-                  val posX = #startX env
-                  val posY = posY + TC.ySpace
                  val acc =
                    if absIdx = cursorIdx then
                      Utils.makeCursor (posX, posY, env) :: acc
@@ -248,8 +246,8 @@ struct
                    , stl
                    , line
                    , ltl
-                    , posX
-                    , posY
+                    , #startX env
+                    , posY + TC.ySpace
                    , 0
                    , lineNumber + 1
                    , absIdx + 1