humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract some more common code (which was used in many delete functions) into its own function

Browse Source
This commit is contained in:
Humza Shahid
2025-08-07 19:31:34 +01:00
parent 0fd63fe82f
commit 5236579cd5
1 changed files with 24 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
fcore/normal-mode/normal-delete.sml
View File

@@ -3,6 +3,22 @@ struct
open AppType open AppType
open MailboxType open MailboxType
fun deleteAndFinish (app: app_type, low, length, buffer) =
let
val searchString = #searchString app
val buffer = LineGap.delete (low, length, buffer)
val buffer = LineGap.goToEnd buffer
val initialMsg = [SEARCH (buffer, searchString)]
val buffer = LineGap.goToIdx (low + 777, buffer)
val searchList = SearchList.buildRange (buffer, searchString, low - 777)
val buffer = LineGap.goToIdx (low, buffer)
in
Finish.buildTextAndClear (app, buffer, low, searchList, initialMsg)
end
(* equivalent of vi's 'x' command **) (* equivalent of vi's 'x' command **)
fun helpRemoveChr (app: app_type, buffer, cursorIdx, count) = fun helpRemoveChr (app: app_type, buffer, cursorIdx, count) =
if count = 0 then if count = 0 then
@@ -128,19 +144,8 @@ struct
val low = Int.min (cursorIdx, otherIdx) val low = Int.min (cursorIdx, otherIdx)
val high = Int.max (cursorIdx, otherIdx) val high = Int.max (cursorIdx, otherIdx)
val length = high - low val length = high - low
val buffer = LineGap.delete (low, length, buffer)
val buffer = LineGap.goToEnd buffer
val initialMsg = [SEARCH (buffer, searchString)]
val buffer = LineGap.goToIdx (cursorIdx + 777, buffer)
val searchList =
SearchList.buildRange (buffer, searchString, cursorIdx - 777)
val buffer = LineGap.goToIdx (low, buffer)
in in
Finish.buildTextAndClear (app, buffer, low, searchList, initialMsg) deleteAndFinish (app, low, length, buffer)
end end
fun deleteToEndOfLine (app: app_type) = fun deleteToEndOfLine (app: app_type) =
@@ -176,18 +181,8 @@ struct
val finishIdx = Cursor.viDlrForDelete (buffer, cursorIdx, count) val finishIdx = Cursor.viDlrForDelete (buffer, cursorIdx, count)
val length = finishIdx - startIdx val length = finishIdx - startIdx
val buffer = LineGap.delete (startIdx, length, buffer)
val buffer = LineGap.goToEnd buffer
val initialMsg = [SEARCH (buffer, searchString)]
val buffer = LineGap.goToIdx (cursorIdx + 777, buffer)
val searchList =
SearchList.buildRange (buffer, searchString, cursorIdx - 777)
val buffer = LineGap.goToIdx (startIdx, buffer)
in in
Finish.buildTextAndClear (app, buffer, startIdx, searchList, initialMsg) deleteAndFinish (app, startIdx, length, buffer)
end end
fun helpDeleteLineBack (app, buffer, low, high, count) = fun helpDeleteLineBack (app, buffer, low, high, count) =
@@ -195,18 +190,8 @@ struct
let let
val low = Int.max (low, 0) val low = Int.max (low, 0)
val length = high - low val length = high - low
val buffer = LineGap.delete (low, length, buffer)
val buffer = LineGap.goToEnd buffer
val searchString = #searchString app
val initialMsg = [SEARCH (buffer, searchString)]
val buffer = LineGap.goToIdx (low + 777, buffer)
val searchList = SearchList.buildRange (buffer, searchString, low - 777)
val buffer = LineGap.goToIdx (low, buffer)
in in
Finish.buildTextAndClear (app, buffer, low, searchList, initialMsg) deleteAndFinish (app, low, length, buffer)
end end
else else
let let
@@ -251,17 +236,8 @@ struct
val low = Int.min (cursorIdx, otherIdx) val low = Int.min (cursorIdx, otherIdx)
val high = Int.max (cursorIdx, otherIdx) val high = Int.max (cursorIdx, otherIdx)
val length = high - low val length = high - low
val buffer = LineGap.delete (low, length, buffer)
val buffer = LineGap.goToEnd buffer
val initialMsg = [SEARCH (buffer, searchString)]
val buffer = LineGap.goToIdx (cursorIdx + 777, buffer)
val searchList =
SearchList.buildRange (buffer, searchString, cursorIdx - 777)
in in
Finish.buildTextAndClear (app, buffer, low, searchList, initialMsg) deleteAndFinish (app, low, length, buffer)
end end
fun helpDeleteToChr fun helpDeleteToChr
@@ -271,18 +247,8 @@ struct
val low = Int.min (cursorIdx, otherIdx) val low = Int.min (cursorIdx, otherIdx)
val high = Int.max (cursorIdx, otherIdx) val high = Int.max (cursorIdx, otherIdx)
val length = high - low val length = high - low
val buffer = LineGap.delete (low, length, buffer)
val buffer = LineGap.goToEnd buffer
val searchString = #searchString app
val initialMsg = [SEARCH (buffer, searchString)]
val buffer = LineGap.goToIdx (cursorIdx + 777, buffer)
val searchList =
SearchList.buildRange (buffer, searchString, cursorIdx - 777)
in in
Finish.buildTextAndClearAfterChr deleteAndFinish (app, low, length, buffer)
(app, buffer, low, searchList, initialMsg)
end end
else else
let let
@@ -436,7 +402,7 @@ struct
end end
fun finishAfterDeleteInside (app: app_type, origLow, high) = fun finishAfterDeleteInside (app: app_type, origLow, high) =
if origLow = high then if origLow = high then
Finish.clearMode app Finish.clearMode app
else else
let let
@@ -449,13 +415,11 @@ struct
val initialMsg = [SEARCH (buffer, searchString)] val initialMsg = [SEARCH (buffer, searchString)]
val buffer = LineGap.goToIdx (low + 777, buffer) val buffer = LineGap.goToIdx (low + 777, buffer)
val searchList = val searchList = SearchList.buildRange (buffer, searchString, low - 777)
SearchList.buildRange (buffer, searchString, low - 777)
val buffer = LineGap.goToIdx (origLow, buffer) val buffer = LineGap.goToIdx (origLow, buffer)
in in
Finish.buildTextAndClear Finish.buildTextAndClear (app, buffer, origLow, searchList, initialMsg)
(app, buffer, origLow, searchList, initialMsg)
end end
fun deleteInsideChrOpen (app: app_type, chr) = fun deleteInsideChrOpen (app: app_type, chr) =