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

add missing implementation of Cursor.matchPair when strIdx is in tl

Browse Source
This commit is contained in:
Humza Shahid
2024-10-31 11:19:10 +00:00
parent 553d4605e7
commit fe317ca220
2 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
fcore/cursor.sml
View File

@@ -1632,6 +1632,54 @@ struct
)
end
fun startMatchPair (strIdx, shd, stl, cursorIdx) =
let
val chr = String.sub (shd, strIdx)
in
(case chr of
#"(" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"(", 1, #")", 0
)
| #")" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"(", 0, #")", 1
)
| #"[" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"[", 1, #"]", 0
)
| #"]" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"[", 0, #"]", 1
)
| #"{" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"{", 1, #"}", 0
)
| #"}" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"{", 0, #"}", 1
)
| #"<" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"<", 1, #">", 0
)
| #">" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"<", 0, #">", 1
)
| _ => cursorIdx)
end
fun matchPair (lineGap: LineGap.t, cursorIdx) =
let
val {rightStrings, idx = bufferIdx, leftStrings, ...} = lineGap
@@ -1644,52 +1692,7 @@ struct
in
if strIdx < String.size shd then
(* strIdx is in this string *)
let
val chr = String.sub (shd, strIdx)
in
(case chr of
#"(" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"(", 1, #")", 0
)
| #")" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"(", 0, #")", 1
)
| #"[" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"[", 1, #"]", 0
)
| #"]" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"[", 0, #"]", 1
)
| #"{" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"{", 1, #"}", 0
)
| #"}" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"{", 0, #"}", 1
)
| #"<" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, stl, cursorIdx
, #"<", 1, #">", 0
)
| #">" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, stl, cursorIdx
, #"<", 0, #">", 1
)
| _ => cursorIdx)
end
startMatchPair (strIdx, shd, stl, cursorIdx)
else
(* strIdx is in tl *)
(case stl of
@@ -1698,7 +1701,7 @@ struct
val strIdx = strIdx - String.size shd
val leftStrings = shd :: leftStrings
in
(print "match pair throw err\n"; raise Match)
startMatchPair (strIdx, stlhd, leftStrings, cursorIdx)
end
| [] => cursorIdx)
end