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

finish reimplementing 'di<symbol>' and 'da<symbol>' motions so that they align more closely with the behaviour of Vim. (Todo: test them next)

Browse Source
This commit is contained in:
Humza Shahid
2026-01-02 20:07:36 +00:00
parent 886f384490
commit bce2a5a22d
4 changed files with 138 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,14 +240,19 @@ struct
case chr of
#"w" => NormalDelete.deleteAroundWord (app, time)
| #"W" => NormalDelete.deleteAroundWORD (app, time)
| #"(" => NormalDelete.deleteAroundChrOpen (app, chr, time)
| #"[" => NormalDelete.deleteAroundChrOpen (app, chr, time)
| #"{" => NormalDelete.deleteAroundChrOpen (app, chr, time)
| #"<" => NormalDelete.deleteAroundChrOpen (app, chr, time)
| #")" => NormalDelete.deleteAroundChrClose (app, chr, time)
| #"]" => NormalDelete.deleteAroundChrClose (app, chr, time)
| #"}" => NormalDelete.deleteAroundChrClose (app, chr, time)
| #">" => NormalDelete.deleteAroundChrClose (app, chr, time)
| #"(" => NormalDelete.deleteAroundPair (app, #"(", #")", time)
| #")" => NormalDelete.deleteAroundPair (app, #"(", #")", time)
| #"[" => NormalDelete.deleteAroundPair (app, #"[", #"]", time)
| #"]" => NormalDelete.deleteAroundPair (app, #"[", #"]", time)
| #"{" => NormalDelete.deleteAroundPair (app, #"{", #"}", time)
| #"}" => NormalDelete.deleteAroundPair (app, #"{", #"}", time)
| #"<" => NormalDelete.deleteAroundPair (app, #"<", #">", time)
| #">" => NormalDelete.deleteAroundPair (app, #"<", #">", time)
| _ => NormalFinish.clearMode app
fun parseDeleteTerminal (str, count, app, chrCmd, time) =
@@ -317,26 +322,37 @@ struct
case chr of
#"w" => NormalYankDelete.deleteInsideWord (app, time)
| #"W" => NormalYankDelete.deleteInsideWORD (app, time)
| #"(" => NormalYankDelete.deleteInsideChrOpen (app, chr, time)
| #"[" => NormalYankDelete.deleteInsideChrOpen (app, chr, time)
| #"{" => NormalYankDelete.deleteInsideChrOpen (app, chr, time)
| #"<" => NormalYankDelete.deleteInsideChrOpen (app, chr, time)
| #")" => NormalYankDelete.deleteInsideChrClose (app, chr, time)
| #"]" => NormalYankDelete.deleteInsideChrClose (app, chr, time)
| #"}" => NormalYankDelete.deleteInsideChrClose (app, chr, time)
| #">" => NormalYankDelete.deleteInsideChrClose (app, chr, time)
| #"(" => NormalYankDelete.deleteInsidePair (app, #"(", #")", time)
| #")" => NormalYankDelete.deleteInsidePair (app, #"(", #")", time)
| #"[" => NormalYankDelete.deleteInsidePair (app, #"[", #"]", time)
| #"]" => NormalYankDelete.deleteInsidePair (app, #"[", #"]", time)
| #"{" => NormalYankDelete.deleteInsidePair (app, #"{", #"}", time)
| #"}" => NormalYankDelete.deleteInsidePair (app, #"{", #"}", time)
| #"<" => NormalYankDelete.deleteInsidePair (app, #"<", #">", time)
| #">" => NormalYankDelete.deleteInsidePair (app, #"<", #">", time)
| _ => NormalFinish.clearMode app
fun parseDeleteAround (app, chr, time) =
case chr of
#"(" => NormalYankDelete.deleteAroundChrOpen (app, chr, time)
| #"[" => NormalYankDelete.deleteAroundChrOpen (app, chr, time)
| #"{" => NormalYankDelete.deleteAroundChrOpen (app, chr, time)
| #"<" => NormalYankDelete.deleteAroundChrOpen (app, chr, time)
| #")" => NormalYankDelete.deleteAroundChrClose (app, chr, time)
| #"]" => NormalYankDelete.deleteAroundChrClose (app, chr, time)
| #"}" => NormalYankDelete.deleteAroundChrClose (app, chr, time)
| #">" => NormalYankDelete.deleteAroundChrClose (app, chr, time)
#"w" => NormalYankDelete.deleteAroundWord (app, time)
| #"W" => NormalYankDelete.deleteAroundWORD (app, time)
| #"(" => NormalYankDelete.deleteAroundPair (app, #"(", #")", time)
| #")" => NormalYankDelete.deleteAroundPair (app, #"(", #")", time)
| #"[" => NormalYankDelete.deleteAroundPair (app, #"[", #"]", time)
| #"]" => NormalYankDelete.deleteAroundPair (app, #"[", #"]", time)
| #"{" => NormalYankDelete.deleteAroundPair (app, #"{", #"}", time)
| #"}" => NormalYankDelete.deleteAroundPair (app, #"{", #"}", time)
| #"<" => NormalYankDelete.deleteAroundPair (app, #"<", #">", time)
| #">" => NormalYankDelete.deleteAroundPair (app, #"<", #">", time)
| _ => NormalFinish.clearMode app
fun parseDeleteTerminal (str, count, app, chrCmd, time) =