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

done refactoring terminal yank commands

Browse Source
This commit is contained in:
Humza Shahid
2025-09-02 12:46:30 +01:00
parent d7f69574af
commit 6cd038cf81
2 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
fcore/normal-mode/normal-mode.sml
View File

@@ -259,49 +259,8 @@ struct
| #"^" => NormalYank.yankToFirstNonSpaceChr app
| #"G" => NormalYank.yankToEndOfText app
| #"%" => NormalYank.yankToMatchingPair app
| #"n" =>
let
open DrawMsg
open MailboxType
val {cursorIdx, searchList, buffer, ...} = app
val high = SearchList.nextMatch (cursorIdx, searchList, count)
in
if high = ~1 orelse high <= cursorIdx then
NormalFinish.clearMode app
else
let
val length = high - cursorIdx
val buffer = LineGap.goToIdx (high, buffer)
val str = LineGap.substring (cursorIdx, length, buffer)
val msg = YANK str
val mode = NORMAL_MODE ""
in
NormalModeWith.modeAndBuffer (app, buffer, mode, [DRAW msg])
end
end
| #"N" =>
let
open DrawMsg
open MailboxType
val {cursorIdx, searchList, buffer, ...} = app
val low = SearchList.prevMatch (cursorIdx, searchList, count)
in
if low = ~1 orelse low >= cursorIdx then
NormalFinish.clearMode app
else
let
val length = cursorIdx - low
val str = LineGap.substring (low, length, buffer)
val msg = YANK str
val mode = NORMAL_MODE ""
in
NormalModeWith.modeAndBuffer (app, buffer, mode, [DRAW msg])
end
end
| #"n" => NormalYank.yankToNextMatch (app, count)
| #"N" => NormalYank.yankToPrevMatch (app, count)
(* todo: non-terminal chars *)
| _ => NormalFinish.clearMode app

39
fcore/normal-mode/normal-yank.sml
View File

@@ -149,4 +149,43 @@ struct
NormalModeWith.modeAndBuffer (app, buffer, mode, [DRAW msg])
end
end
fun yankToNextMatch (app: app_type, count) =
let
val {cursorIdx, searchList, buffer, ...} = app
val high = SearchList.nextMatch (cursorIdx, searchList, count)
in
if high = ~1 orelse high <= cursorIdx then
NormalFinish.clearMode app
else
let
val length = high - cursorIdx
val buffer = LineGap.goToIdx (high, buffer)
val str = LineGap.substring (cursorIdx, length, buffer)
val msg = YANK str
val mode = NORMAL_MODE ""
in
NormalModeWith.modeAndBuffer (app, buffer, mode, [DRAW msg])
end
end
fun yankToPrevMatch (app: app_type, count) =
let
val {cursorIdx, searchList, buffer, ...} = app
val low = SearchList.prevMatch (cursorIdx, searchList, count)
in
if low = ~1 orelse low >= cursorIdx then
NormalFinish.clearMode app
else
let
val length = cursorIdx - low
val str = LineGap.substring (low, length, buffer)
val msg = YANK str
val mode = NORMAL_MODE ""
in
NormalModeWith.modeAndBuffer (app, buffer, mode, [DRAW msg])
end
end
end