add tests for 'yh' motion

fcore/normal-mode/normal-yank.sml

@@ -10,7 +10,7 @@ struct
 
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
       val min = Cursor.vi0 (buffer, cursorIdx)
-      val low = Cursor.viH (buffer, cursorIdx, 1)
+      val low = Cursor.viH (buffer, cursorIdx, count)
 
       val low = Int.max (min, low)
       val length = cursorIdx - low

shf-tests.mlb

@@ -70,5 +70,6 @@ test/regex-tests.sml
 test/test-utils.sml
 test/normal-move.sml
 test/normal-delete.sml
+test/normal-yank.sml
 test/regression.sml
 test/test.sml

temp.txt

@@ -1 +1 @@
-( ( hello ) )
+hello world

test/normal-yank.sml

@@ -0,0 +1,95 @@
+structure NormalYank =
+struct
+  open Railroad
+  open Railroad.Test
+  open InputMsg
+
+  val yhYank = describe "yank motion 'yh'"
+    [ test "yanks empty string when cursor is at index 0" (fn _ =>
+        let
+          (* arrange *)
+          val originalString = "hello world\n"
+          val app = TestUtils.init originalString
+          val app = AppWith.idx (app, 0)
+
+          (* act *)
+          val app = TestUtils.updateMany (app, "yh")
+
+          (* assert *)
+          val expectedString = ""
+        in
+          TestUtils.expectYank (app, expectedString)
+        end)
+    , test "yanks empty string when character before cursor is a newline"
+        (fn _ =>
+           let
+             (* arrange *)
+             val originalString = "hello\nworld\n"
+             val app = TestUtils.init originalString
+             val app = AppWith.idx (app, 6)
+
+             (* act *)
+             val app = TestUtils.updateMany (app, "yh")
+
+             (* assert *)
+             val expectedString = ""
+           in
+             TestUtils.expectYank (app, expectedString)
+           end)
+    , test "yanks one char to the left when on a non-newline" (fn _ =>
+        let
+          (* arrange *)
+          val originalString = "hello world\n"
+          val app = TestUtils.init originalString
+          val app = AppWith.idx (app, 5)
+
+          (* act *)
+          val app = TestUtils.updateMany (app, "yh")
+
+          (* assert *)
+          val expectedString = "o"
+        in
+          TestUtils.expectYank (app, expectedString)
+        end)
+    , test "yanks 3 chars when count is 3" (fn _ =>
+        let
+          (* arrange *)
+          val originalIdx = 5
+          val originalString = "hello world\n"
+
+          val app = TestUtils.init originalString
+          val app = AppWith.idx (app, originalIdx)
+
+          (* act *)
+          val app = TestUtils.updateMany (app, "3yh")
+
+          (* assert *)
+          val expectedString = "llo"
+        in
+          TestUtils.expectYank (app, expectedString)
+        end)
+    , test
+        "yanks from cursor position to start column when \
+        \count is greater than current column"
+        (fn _ =>
+           let
+             (* arrange *)
+             val originalIdx = 5
+             val originalString = "hello world\n"
+
+             val app = TestUtils.init originalString
+             val app = AppWith.idx (app, originalIdx)
+
+             (* act *)
+             val app = TestUtils.updateMany (app, "9yh")
+
+             (* assert *)
+             val expectedString = "hello"
+           in
+             TestUtils.expectYank (app, expectedString)
+           end)
+    ]
+
+
+  val tests = [yhYank]
+end

test/test-utils.sml

@@ -24,4 +24,34 @@ struct
     in
       loop (0, app)
     end
+
+  fun expectYank (app: AppType.app_type, expectedString) =
+    let
+      open MailboxType
+      open DrawMsg
+      open Railroad
+      open Railroad.Test
+
+      fun loop (hd :: tl) =
+            (case hd of
+               DRAW (YANK actualString) =>
+                 if actualString = expectedString then
+                   Expect.isTrue (actualString = expectedString)
+                 else
+                   let
+                     val () = print
+                       ("expectedString = [" ^ expectedString ^ "]\n")
+                     val () = print ("actualString = [" ^ actualString ^ "]\n")
+                     val () = print "\n"
+                   in
+                     Expect.isTrue (actualString = expectedString)
+                   end
+             | _ => loop tl)
+        | loop ([]) =
+            let val () = print "no string yanked\n"
+            in Expect.isTrue false
+            end
+    in
+      loop (#msgs app)
+    end
 end

test/test.sml

@@ -5,13 +5,13 @@ struct
 
   fun main () =
     let
-      val tests =
+      val tests = List.concat
-        List.concat
+        [ NormalMove.tests
-          [ NormalMove.tests
+        , NormalDelete.tests
-          , NormalDelete.tests
+        , NormalYank.tests
-          , Regression.tests
+        , Regression.tests
-          , RegexTests.tests
+        , RegexTests.tests
-          ]
+        ]
       val tests = concat tests
     in
       runWithConfig [Configuration.PrintPassed false] tests

todo.md

@@ -1,4 +1,3 @@
 # To-do list
 
-- Implement `yh` motion.
+- Implement `yl` motion and add tests for it.
-  - Implemented. Add tests for it next (based on tests for 'dh' motion).