From 665497cf46f2923aed836eedfad929997b7f5f23 Mon Sep 17 00:00:00 2001
From: Humza Shahid <humzasaur@gmail.com>
Date: Mon, 29 Sep 2025 15:06:33 +0100
Subject: [PATCH] fix all remaining type errors

---
 fcore/normal-mode/normal-mode.sml        |  2 +-
 fcore/normal-mode/normal-search-mode.sml |  1 -
 message-types/input-msg.sml              |  2 +-
 shf.mlb                                  | 10 +++++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/fcore/normal-mode/normal-mode.sml b/fcore/normal-mode/normal-mode.sml
index 434732a..d770ca3 100644
--- a/fcore/normal-mode/normal-mode.sml
+++ b/fcore/normal-mode/normal-mode.sml
@@ -7,7 +7,7 @@ struct
 
   fun switchToNormalSearchMode (app: app_type) =
     NormalSearchFinish.onSearchChanged
-      (app, "", Vector.fromList [], 0, 0, #buffer app)
+      (app, "", PersistentVector.empty, 0, 0, #buffer app)
 
   fun getNumLength (pos, str) =
     if pos = String.size str then
diff --git a/fcore/normal-mode/normal-search-mode.sml b/fcore/normal-mode/normal-search-mode.sml
index 722e0bd..671fcaf 100644
--- a/fcore/normal-mode/normal-search-mode.sml
+++ b/fcore/normal-mode/normal-search-mode.sml
@@ -81,7 +81,6 @@ struct
         , windowWidth
         , windowHeight
         , tempSearchList
-        , searchString
         , visualScrollColumn
         )
       val drawMsg = Vector.concat drawMsg
diff --git a/message-types/input-msg.sml b/message-types/input-msg.sml
index cf7c974..532fa4f 100644
--- a/message-types/input-msg.sml
+++ b/message-types/input-msg.sml
@@ -6,7 +6,7 @@ struct
   | KEY_ENTER
   | KEY_BACKSPACE
   | RESIZE_EVENT of int * int
-  | WITH_SEARCH_LIST of int vector * Time.time
+  | WITH_SEARCH_LIST of PersistentVector.t * Time.time
   | ARROW_LEFT
   | ARROW_UP
   | ARROW_RIGHT
diff --git a/shf.mlb b/shf.mlb
index b40348d..5f88385 100644
--- a/shf.mlb
+++ b/shf.mlb
@@ -6,11 +6,6 @@ lib/brolib-sml/src/gap_set.sml
 lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
 
 (* FUNCTIONAL CORE *)
-message-types/input-msg.sml
-message-types/draw-msg.sml
-message-types/search-msg.sml
-message-types/mailbox-type.sml
-
 fcore/escape-string.sml
 fcore/bin-search.sml
 
@@ -22,6 +17,11 @@ end
 fcore/search-list/nfa.sml
 fcore/search-list.sml
 
+message-types/input-msg.sml
+message-types/draw-msg.sml
+message-types/search-msg.sml
+message-types/mailbox-type.sml
+
 fcore/app-type.sml
 fcore/normal-mode/normal-mode-with.sml
 fcore/normal-mode/normal-search-mode-with.sml