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

fix minor bug in Cursor.matchPair fuunction; depending on chr at strIdx, we might want to iterate on the leftStrings or on the rightStrings. Before, we iterated on the rightStrings only, but now we iterate on whichever is appropriate

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

98
fcore/cursor.sml
View File

@@ -1596,7 +1596,7 @@ struct
val closeNum = if chr = closeChr then closeNum + 1 else closeNum
in
if openNum = closeNum then
absIdx
absIdx
else
helpMatchPairNext
( strPos + 1, str, absIdx + 1, stl, origIdx
@@ -1611,7 +1611,7 @@ struct
if strPos < 0 then
case stl of
hd :: tl =>
helpMatchPairNext
helpMatchPairPrev
( String.size hd - 1, hd, absIdx, tl, origIdx
, openChr, openNum, closeChr, closeNum
)
@@ -1632,53 +1632,49 @@ 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 startMatchPair (strIdx, shd, leftStrings, rightStrings, cursorIdx) =
case String.sub (shd, strIdx) of
#"(" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, rightStrings, cursorIdx
, #"(", 1, #")", 0
)
| #")" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, leftStrings, cursorIdx
, #"(", 0, #")", 1
)
| #"[" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, rightStrings, cursorIdx
, #"[", 1, #"]", 0
)
| #"]" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, leftStrings, cursorIdx
, #"[", 0, #"]", 1
)
| #"{" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, rightStrings, cursorIdx
, #"{", 1, #"}", 0
)
| #"}" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, leftStrings, cursorIdx
, #"{", 0, #"}", 1
)
| #"<" =>
helpMatchPairNext
( strIdx + 1, shd, cursorIdx + 1, rightStrings, cursorIdx
, #"<", 1, #">", 0
)
| #">" =>
helpMatchPairPrev
( strIdx - 1, shd, cursorIdx - 1, leftStrings, cursorIdx
, #"<", 0, #">", 1
)
| _ => cursorIdx
fun matchPair (lineGap: LineGap.t, cursorIdx) =
let
@@ -1692,7 +1688,7 @@ struct
in
if strIdx < String.size shd then
(* strIdx is in this string *)
startMatchPair (strIdx, shd, stl, cursorIdx)
startMatchPair (strIdx, shd, leftStrings, stl, cursorIdx)
else
(* strIdx is in tl *)
(case stl of
@@ -1701,7 +1697,7 @@ struct
val strIdx = strIdx - String.size shd
val leftStrings = shd :: leftStrings
in
startMatchPair (strIdx, stlhd, leftStrings, cursorIdx)
startMatchPair (strIdx, stlhd, leftStrings, stltl, cursorIdx)
end
| [] => cursorIdx)
end