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

done implementing 'deleteInside' and 'deleteAroundd' commands

Browse Source
This commit is contained in:
Humza Shahid
2025-08-07 23:33:40 +01:00
parent 5236579cd5
commit f848d4f301
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,4 +449,34 @@ struct
in in
finishAfterDeleteInside (app, origLow, high) finishAfterDeleteInside (app, origLow, high)
end end
fun deleteAroundChrOpen (app: app_type, chr) =
let
val {cursorIdx, buffer, ...} = app
val start = cursorIdx + 1
val buffer = LineGap.goToIdx (start, buffer)
val low = Cursor.toPrevChr (buffer, start, chr)
val buffer = LineGap.goToIdx (low, buffer)
val high = Cursor.matchPair (buffer, low)
in
if low = high then Finish.clearMode app
else deleteAndFinish (app, low, high - low + 1, buffer)
end
fun deleteAroundChrClose (app: app_type, chr) =
let
val {cursorIdx, buffer, ...} = app
val start = Int.max (cursorIdx - 1, 0)
val buffer = LineGap.goToIdx (start, buffer)
val high = Cursor.toNextChr (buffer, start, chr)
val buffer = LineGap.goToIdx (high, buffer)
val low = Cursor.matchPair (buffer, high)
in
if low = high then Finish.clearMode app
else deleteAndFinish (app, low, high - low + 1, buffer)
end
end end

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

@@ -125,6 +125,18 @@ struct
| #">" => NormalDelete.deleteInsideChrClose (app, chr) | #">" => NormalDelete.deleteInsideChrClose (app, chr)
| _ => Finish.clearMode app | _ => Finish.clearMode app
fun parseDeleteAround (app, chr) =
case chr of
#"(" => NormalDelete.deleteInsideChrOpen (app, chr)
| #"[" => NormalDelete.deleteInsideChrOpen (app, chr)
| #"{" => NormalDelete.deleteInsideChrOpen (app, chr)
| #"<" => NormalDelete.deleteInsideChrOpen (app, chr)
| #")" => NormalDelete.deleteAroundChrClose (app, chr)
| #"]" => NormalDelete.deleteAroundChrClose (app, chr)
| #"}" => NormalDelete.deleteAroundChrClose (app, chr)
| #">" => NormalDelete.deleteAroundChrClose (app, chr)
| _ => Finish.clearMode app
fun parseDelete (strPos, str, count, app, newCmd) = fun parseDelete (strPos, str, count, app, newCmd) =
if strPos = String.size str - 1 then if strPos = String.size str - 1 then
(* have to check newCmd *) (* have to check newCmd *)
@@ -161,6 +173,7 @@ struct
| #"F" => appendChr (app, chr, str) | #"F" => appendChr (app, chr, str)
| #"g" => appendChr (app, chr, str) | #"g" => appendChr (app, chr, str)
| #"i" => appendChr (app, chr, str) | #"i" => appendChr (app, chr, str)
| #"a" => appendChr (app, chr, str)
(* invalid command: reset mode *) (* invalid command: reset mode *)
| _ => Finish.clearMode app) | _ => Finish.clearMode app)
| KEY_ESC => Finish.clearMode app | KEY_ESC => Finish.clearMode app
@@ -232,6 +245,14 @@ struct
Finish.resizeText (app, width, height) Finish.resizeText (app, width, height)
| WITH_SEARCH_LIST searchList => | WITH_SEARCH_LIST searchList =>
Finish.withSearchList (app, searchList)) Finish.withSearchList (app, searchList))
| #"a" =>
(case newCmd of
CHAR_EVENT chr => parseDeleteAround (app, chr)
| KEY_ESC => Finish.clearMode app
| RESIZE_EVENT (width, height) =>
Finish.resizeText (app, width, height)
| WITH_SEARCH_LIST searchList =>
Finish.withSearchList (app, searchList))
| _ => Finish.clearMode app | _ => Finish.clearMode app
(* useful reference as list of non-terminal commands *) (* useful reference as list of non-terminal commands *)