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

This commit is contained in:
2024-10-31 11:19:10 +00:00
parent 553d4605e7
commit fe317ca220
2 changed files with 50 additions and 47 deletions

View File

@@ -1632,18 +1632,7 @@ struct
) )
end end
fun matchPair (lineGap: LineGap.t, cursorIdx) = fun startMatchPair (strIdx, shd, stl, cursorIdx) =
let
val {rightStrings, idx = bufferIdx, leftStrings, ...} = lineGap
in
case rightStrings of
shd :: stl =>
let
(* convert absolute cursorIdx to idx relative to hd string *)
val strIdx = cursorIdx - bufferIdx
in
if strIdx < String.size shd then
(* strIdx is in this string *)
let let
val chr = String.sub (shd, strIdx) val chr = String.sub (shd, strIdx)
in in
@@ -1690,6 +1679,20 @@ struct
) )
| _ => cursorIdx) | _ => cursorIdx)
end end
fun matchPair (lineGap: LineGap.t, cursorIdx) =
let
val {rightStrings, idx = bufferIdx, leftStrings, ...} = lineGap
in
case rightStrings of
shd :: stl =>
let
(* convert absolute cursorIdx to idx relative to hd string *)
val strIdx = cursorIdx - bufferIdx
in
if strIdx < String.size shd then
(* strIdx is in this string *)
startMatchPair (strIdx, shd, stl, cursorIdx)
else else
(* strIdx is in tl *) (* strIdx is in tl *)
(case stl of (case stl of
@@ -1698,7 +1701,7 @@ struct
val strIdx = strIdx - String.size shd val strIdx = strIdx - String.size shd
val leftStrings = shd :: leftStrings val leftStrings = shd :: leftStrings
in in
(print "match pair throw err\n"; raise Match) startMatchPair (strIdx, stlhd, leftStrings, cursorIdx)
end end
| [] => cursorIdx) | [] => cursorIdx)
end end

BIN
shf

Binary file not shown.