remove usage of concurrent ml, deciding that we prefer to run everything in the main thread instead

fcore/normal-mode/make-normal-delete.sml

@@ -11,14 +11,7 @@ struct
 
   fun finishAfterDeletingBuffer (app: app_type, low, buffer, time, msgs) =
     let
-      val buffer = LineGap.goToIdx (low, buffer)
-      val buffer = LineGap.goToStart buffer
-      val msgs = SEARCH (buffer, #dfa app, time) :: msgs
-
-      val buffer = LineGap.goToIdx (low - 1111, buffer)
-      val (buffer, searchList) =
-        SearchList.buildRange (buffer, low + 1111, #dfa app)
-
+      val (buffer, searchList) = SearchList.build (buffer, #dfa app)
       val buffer = LineGap.goToIdx (low, buffer)
     in
       NormalFinish.buildTextAndClear (app, buffer, low, searchList, msgs, time)
@@ -233,12 +226,7 @@ struct
         val initialMsg = Fn.initMsgs (low, length, buffer)
 
         val buffer = LineGap.delete (low, length, buffer)
-        val buffer = LineGap.goToStart buffer
-        val initialMsg = SEARCH (buffer, #dfa app, time) :: initialMsg
-
-        val buffer = LineGap.goToIdx (cursorIdx - 1111, buffer)
-        val (buffer, searchList) =
-          SearchList.buildRange (buffer, cursorIdx + 1111, #dfa app)
+        val (buffer, searchList) = SearchList.build (buffer, #dfa app)
 
         (* If we have deleted from the buffer so that cursorIdx
         * is no longer a valid idx,
@@ -736,12 +724,9 @@ struct
       val buffer = LineGap.delete (0, cursorIdx, buffer)
       val buffer =
         if #textLength buffer = 0 then LineGap.fromString "\n" else buffer
-      val buffer = LineGap.goToStart buffer
-      val initialMsg = SEARCH (buffer, dfa, time) :: initialMsg
 
       val buffer = LineGap.goToIdx (cursorIdx - 1111, buffer)
-      val (buffer, searchList) =
-        SearchList.buildRange (buffer, cursorIdx + 1111, dfa)
+      val (buffer, searchList) = SearchList.build (buffer, dfa)
 
       val cursorIdx = 0
       val startLine = 0
@@ -813,11 +798,7 @@ struct
       val initialMsg = Fn.initMsgs (low, length, buffer)
 
       val buffer = LineGap.delete (low, length, buffer)
-      val buffer = LineGap.goToStart buffer
-      val initialMsg = SEARCH (buffer, dfa, time) :: initialMsg
-
-      val buffer = LineGap.goToIdx (low - 1111, buffer)
-      val (buffer, searchList) = SearchList.buildRange (buffer, low + 1111, dfa)
+      val (buffer, searchList) = SearchList.build (buffer, dfa)
 
       val buffer = LineGap.goToIdx (low, buffer)
     in
@@ -873,12 +854,7 @@ struct
 
           val buffer = LineGap.delete (low, length, buffer)
 
-          val buffer = LineGap.goToStart buffer
-          val initialMsg = SEARCH (buffer, dfa, time) :: initialMsg
-
-          val buffer = LineGap.goToIdx (low - 1111, buffer)
-          val (buffer, searchList) =
-            SearchList.buildRange (buffer, low + 1111, dfa)
+          val (buffer, searchList) = SearchList.build (buffer, dfa)
 
           val buffer = LineGap.goToIdx (low, buffer)
         in
@@ -904,13 +880,7 @@ struct
         let
           val initialMsg = Fn.initMsgs (low, length, buffer)
           val buffer = LineGap.delete (low, length, buffer)
-
-          val buffer = LineGap.goToStart buffer
-          val initialMsg = SEARCH (buffer, dfa, time) :: initialMsg
-
-          val buffer = LineGap.goToIdx (low - 1111, buffer)
-          val (buffer, searchList) =
-            SearchList.buildRange (buffer, low + 1111, dfa)
+          val (buffer, searchList) = SearchList.build (buffer, dfa)
 
           val buffer = LineGap.goToIdx (low, buffer)
         in
@@ -934,12 +904,7 @@ struct
         val initialMsg = Fn.initMsgs (low, length, buffer)
 
         val buffer = LineGap.delete (low, length, buffer)
-        val buffer = LineGap.goToStart buffer
-        val initialMsg = SEARCH (buffer, dfa, time) :: initialMsg
-
-        val buffer = LineGap.goToIdx (low - 1111, buffer)
-        val (buffer, searchList) =
-          SearchList.buildRange (buffer, low + 1111, dfa)
+        val (buffer, searchList) = SearchList.build (buffer, dfa)
 
         val buffer = LineGap.goToIdx (origLow, buffer)
       in
@@ -1037,6 +1002,8 @@ struct
           val initialMsg = Fn.initMsgs (low, length, buffer)
 
           val buffer = LineGap.delete (low, length, buffer)
+          val (buffer, searchList) = SearchList.build (buffer, dfa)
+
           val buffer = LineGap.goToIdx (low, buffer)
 
           val low =
@@ -1047,13 +1014,6 @@ struct
             else
               low
 
-          val buffer = LineGap.goToStart buffer
-          val initialMsg = SEARCH (buffer, dfa, time) :: initialMsg
-
-          val buffer = LineGap.goToIdx (low - 1111, buffer)
-          val (buffer, searchList) =
-            SearchList.buildRange (buffer, low + 1111, dfa)
-
           val buffer = LineGap.goToIdx (low, buffer)
         in
           NormalFinish.buildTextAndClear

fcore/normal-mode/normal-finish.sml

@@ -62,24 +62,6 @@ struct
         )
     end
 
-  fun withSearchList (app: app_type, searchList, searchTime) =
-    let
-      open Time
-    in
-      if searchTime >= #bufferModifyTime app then
-        let
-          val {buffer, cursorIdx, bufferModifyTime, ...} = app
-          val app =
-            NormalModeWith.searchList
-              (app, searchList, buffer, bufferModifyTime)
-        in
-          buildTextAndClear
-            (app, buffer, cursorIdx, searchList, [], bufferModifyTime)
-        end
-      else
-        app
-    end
-
   fun resizeText (app: app_type, newWidth, newHeight) =
     let
       val

fcore/normal-mode/normal-mode.sml

@@ -33,10 +33,9 @@ struct
 
           val {cursorIdx = origCursorIdx, dfa, ...} = app
           val buffer = LineGap.goToStart buffer
-          val initialMsg = [SEARCH (buffer, dfa, time)]
         in
           NormalDelete.finishAfterDeletingBuffer
-            (app, origCursorIdx, buffer, time, initialMsg)
+            (app, origCursorIdx, buffer, time, [])
         end
       else
         let
@@ -127,10 +126,9 @@ struct
             loop (nextLine, buffer, count - 1)
 
         val buffer = LineGap.goToStart buffer
-        val initialMsg = [SEARCH (buffer, dfa, time)]
       in
         NormalDelete.finishAfterDeletingBuffer
-          (app, newCursorIdx, buffer, time, initialMsg)
+          (app, newCursorIdx, buffer, time, [])
       end
   end
 
@@ -616,8 +614,6 @@ struct
     | KEY_ESC => NormalFinish.clearMode app
     | RESIZE_EVENT (width, height) =>
         NormalFinish.resizeText (app, width, height)
-    | WITH_SEARCH_LIST (searchList, time) =>
-        NormalFinish.withSearchList (app, searchList, time)
 
     (* Don't need to handle these keys in normal mode.
      * Everything that is possible through them in Vi and Vim

fcore/normal-mode/normal-search-mode.sml

@@ -82,7 +82,7 @@ struct
         else CaseInsensitiveDfa.fromString searchString
 
       val buffer = LineGap.goToStart buffer
-      val initialMsg = [SEARCH (buffer, dfa, time)]
+      val searchList = SearchList.build (buffer, dfa)
 
       (* move LineGap to first line displayed on screen *)
       val buffer = LineGap.goToLine (startLine, buffer)
@@ -101,7 +101,7 @@ struct
         )
       val drawMsg = Vector.concat drawMsg
       val drawMsg = DrawMsg.DRAW_TEXT drawMsg
-      val msgs = DRAW drawMsg :: initialMsg
+      val msgs = [DRAW drawMsg]
 
       val mode = NORMAL_MODE ""
     in
@@ -253,8 +253,6 @@ struct
           , searchScrollColumn
           , caseSensitive
           )
-    | WITH_SEARCH_LIST (searchList, time) =>
-        NormalFinish.withSearchList (app, searchList, time)
     | RESIZE_EVENT (width, height) =>
         NormalSearchFinish.resize
           ( app