done testing that search list updates properly on deletion motions

shf/test/normal-delete-tests.sml

@@ -9354,6 +9354,152 @@ struct
            in
              Expect.isTrue (expectedString = actualString)
            end)
+    , test "has same searchList when deleting after all matches" (fn _ =>
+        let
+          (* arrange *)
+          val originalIdx = 9
+          val originalString = "hello (world)\n"
+
+          val app = TestUtils.init originalString
+          val app = AppWith.idx (app, originalIdx)
+
+          val app = TestUtils.updateMany (app, "/hello")
+          val app = AppUpdate.update (app, InputMsg.KEY_ENTER, Time.now ())
+
+          (* act *)
+          val newApp = TestUtils.updateMany (app, "da(")
+        in
+          (* assert *)
+          Expect.isTrue (#searchList app = #searchList newApp)
+        end)
+    , test "decrements search list when we delete text section preceding match"
+        (fn _ =>
+           let
+             (* arrange *)
+             val originalIdx = 3
+             val originalString = "[hello] world\n"
+
+             val app = TestUtils.init originalString
+             val app = AppWith.idx (app, originalIdx)
+
+             val app = TestUtils.updateMany (app, "/world")
+             val app = AppUpdate.update (app, InputMsg.KEY_ENTER, Time.now ())
+
+             (* act *)
+             val newApp = TestUtils.updateMany (app, "da[")
+
+             (* assert *)
+             val oldSearchList = #searchList app
+             val oldSearchList = PersistentVector.toList oldSearchList
+
+             val newSearchList = #searchList newApp
+             val newSearchList = PersistentVector.toList newSearchList
+
+             val expectedOldSearchList = [{start = 8, finish = 12}]
+             val expectedNewSearchList = [{start = 1, finish = 5}]
+
+             val assertion =
+               oldSearchList = expectedOldSearchList
+               andalso newSearchList = expectedNewSearchList
+           in
+             Expect.isTrue assertion
+           end)
+    , test "recognises new match when there is a match after deletion" (fn _ =>
+        let
+          (* arrange *)
+          val originalIdx = 9
+          val originalString = "hello {again} world\n"
+
+          val app = TestUtils.init originalString
+          val app = AppWith.idx (app, originalIdx)
+
+          val app = TestUtils.updateMany (app, "/hello  world")
+          val app = AppUpdate.update (app, InputMsg.KEY_ENTER, Time.now ())
+
+          (* act *)
+          val newApp = TestUtils.updateMany (app, "da{")
+
+          (* assert *)
+          val oldSearchList = #searchList app
+          val oldSearchList = PersistentVector.toList oldSearchList
+          val newSearchList = #searchList newApp
+          val newSearchList = PersistentVector.toList newSearchList
+
+          val expectedOldSearchList = []
+          val expectedNewSearchList = [{start = 0, finish = 11}]
+
+          val assertion =
+            oldSearchList = expectedOldSearchList
+            andalso newSearchList = expectedNewSearchList
+        in
+          Expect.isTrue assertion
+        end)
+    , test
+        "extends existing match when existing match should extend after deletion"
+        (fn _ =>
+           let
+             (* arrange *)
+             val originalIdx = 1
+             val originalString = "a<b>b\n"
+
+             val app = TestUtils.init originalString
+             val app = AppWith.idx (app, originalIdx)
+
+             val app = TestUtils.updateMany (app, "/ab?")
+             val app = AppUpdate.update (app, InputMsg.KEY_ENTER, Time.now ())
+
+             (* act *)
+             val newApp = TestUtils.updateMany (app, "da<")
+
+             (* assert *)
+             val oldSearchList = #searchList app
+             val oldSearchList = PersistentVector.toList oldSearchList
+
+             val newSearchList = #searchList newApp
+             val newSearchList = PersistentVector.toList newSearchList
+
+             val expectedOldSearchList = [{start = 0, finish = 0}]
+             val expectedNewSearchList = [{start = 0, finish = 1}]
+
+             val assertion =
+               oldSearchList = expectedOldSearchList
+               andalso newSearchList = expectedNewSearchList
+           in
+             Expect.isTrue assertion
+           end)
+    , test
+        "deletes match in search list \
+        \when match no longer exists in buffer after deletion"
+        (fn _ =>
+           let
+             (* arrange *)
+             val originalIdx = 7
+             val originalString = "hello (again) world\n"
+
+             val app = TestUtils.init originalString
+             val app = AppWith.idx (app, originalIdx)
+
+             val app = TestUtils.updateMany (app, "/again")
+             val app = AppUpdate.update (app, InputMsg.KEY_ENTER, Time.now ())
+
+             (* act *)
+             val newApp = TestUtils.updateMany (app, "da(")
+
+             (* assert *)
+             val oldSearchList = #searchList app
+             val oldSearchList = PersistentVector.toList oldSearchList
+             val newSearchList = #searchList newApp
+             val newSearchList = PersistentVector.toList newSearchList
+
+             val expectedOldSearchList = [{start = 7, finish = 11}]
+             val expectedNewSearchList = []
+
+             val assertion =
+               oldSearchList = expectedOldSearchList
+               andalso newSearchList = expectedNewSearchList
+           in
+             Expect.isTrue assertion
+           end)
     ]
 
   val tests =

shf/todo.md

@@ -1,9 +1,5 @@
 # To-do list
-- Add normal-delete tests for each motion, checking that searchList is as expected
-  - Three cases for searchList:
-    1. Deletion causes two words to join to form a new match
-    2. Deletion causes an existing match to be extended
-    3. Deletion introduces no match
+- Refactor PersistentVector so that the LEAF node only contains integer vectors (one for the finishIdx, which we already have, and one for the startIdx)
 - Add tests for indent, dedent and remove-line-break motions
   - Add tests that searchList updates as expected too
 - Add tests for other yank motoins