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

rewrite viK in accordance with previous commits

Browse Source
This commit is contained in:
Humza Shahid
2024-11-05 21:42:56 +00:00
parent 7f1e5249f0
commit 62d62a8429
2 changed files with 46 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
fcore/cursor.sml
View File

@@ -520,75 +520,27 @@ struct
case String.sub (str, strPos) of case String.sub (str, strPos) of
#"\n" => #"\n" =>
if hasPassedLine then if hasPassedLine then
(* reached end of line twice, (* reached line break twice,
* but line has fewer chars than preferredColumn * but line has fewer chars than preferredColumn
* note: if in double \n\n linebreak, * so go back to chr immediately after this second line break *)
* then return absIdx of second linebreak. *) absIdx + 1
if strPos > 0 then
(* check for double linebreak in string *)
if String.sub (str, strPos - 1) = #"\n" then
(* in double linebreak *)
absIdx
else
(* not in double linebreak *)
absIdx - 1
else
(* check for double linebreak in tl *)
(case strTl of
hd :: _ =>
if String.sub (hd, String.size hd - 1) = #"\n" then
(* in double linebreak *)
absIdx
else
(* not in double linebreak *)
absIdx - 1
| [] =>
(* tl is empty, so return start *)
0)
else else
(* reached start of line once; (* reached start of line once;
* have to check if this is a double linebreak, * have to check if this is a double linebreak,
* and return idx of second linebreak if so *) * and return idx of second linebreak if so *)
if strPos > 0 then let
if String.sub (str, strPos - 1) = #"\n" then (* have to calculate column of current line
absIdx * so we know which line to stop searching at *)
else val lineColumn =
let helpGetCursorColumnBranch
(* have to calculate column of current line (strPos - 1, str, lineHd, strTl, lineTl)
* so we know which line to stop searching at *) in
val lineColumn = helpViK
helpGetCursorColumnBranch ( strPos - 1, str, absIdx - 1
(strPos - 1, str, lineHd, strTl, lineTl) , lineColumn, preferredColumn, true
in , strTl, lineHd, lineTl
helpViK )
( strPos - 1, str, absIdx - 1 end
, lineColumn, preferredColumn, true
, strTl, lineHd, lineTl
)
end
else
(* this is first chr of string; must check string's tl next *)
(case strTl of
hd :: tl =>
if String.sub (hd, String.size hd - 1) = #"\n" then
(* in double linebreak *)
absIdx
else
(* not in double linebreak *)
let
val lineColumn =
helpGetCursorColumnBranch
(strPos - 1, str, lineHd, strTl, lineTl)
in
helpViK
( strPos - 1, str, absIdx - 1
, lineColumn, preferredColumn, true
, strTl, lineHd, lineTl
)
end
| [] =>
(* no more strings so return last idx *)
absIdx)
| _ => | _ =>
if lineColumn <= preferredColumn andalso hasPassedLine then if lineColumn <= preferredColumn andalso hasPassedLine then
(* We're at or before the preferredColumn so return absIdx (* We're at or before the preferredColumn so return absIdx
@@ -605,6 +557,28 @@ struct
, strTl, lineHd, lineTl , strTl, lineHd, lineTl
) )
fun startViK (lg, strIdx, shd, cursorIdx, leftStrings, lhd, leftLines) =
if String.sub (shd, strIdx) = #"\n" then
if strIdx - 1 > 0 then
helpVi0
(strIdx - 2, shd, cursorIdx - 2, leftStrings, leftLines)
else
case (leftStrings, leftLines) of
(lshd :: lstl, llhd :: lltl) =>
helpVi0
(String.size lshd - 1, lshd, cursorIdx - 2, lstl, lltl)
| (_, _) => 0
else
let
val lineColumn = getCursorColumn (lg, cursorIdx)
in
helpViK
( strIdx, shd, cursorIdx
, lineColumn, lineColumn, false
, leftStrings, lhd, leftLines
)
end
fun viK (lineGap: LineGap.t, cursorIdx) = fun viK (lineGap: LineGap.t, cursorIdx) =
let let
val val
@@ -619,105 +593,21 @@ struct
in in
if strIdx < String.size strHd then if strIdx < String.size strHd then
(* strIdx is in this string *) (* strIdx is in this string *)
if String.sub (strHd, strIdx) = #"\n" then startViK
(* if we are at a newline *) (lineGap, strIdx, strHd, cursorIdx, leftStrings, lnHd, leftLines)
if strIdx > 0 then
if String.sub (strHd, strIdx - 1) = #"\n" then
(* if in double linebreak *)
helpVi0
(strIdx - 2, strHd, cursorIdx - 2, leftStrings, leftLines)
else
(* not in double linebreak *)
helpVi0
(strIdx - 1, strHd, cursorIdx - 1, leftStrings, leftLines)
else
(* check leftStrings to see if we are in a double linebreak *)
(case (leftStrings, leftLines) of
(lStrHd :: lStrTl, lLnHd :: lLnTl) =>
if String.sub (lStrHd, String.size lStrHd - 1) = #"\n" then
(* in double linebreak *)
helpVi0
( String.size lStrHd - 2, lStrHd, cursorIdx - 2
, lStrTl, lLnTl
)
else
(* in single linebreak *)
helpVi0
( strIdx - 1, strHd, cursorIdx - 1
, leftStrings, leftLines
)
| (_, _) =>
helpViK
( strIdx - 1, strHd, cursorIdx - 1
, 0, 0, true
, leftStrings, lnHd, leftLines
))
else
(* not at newline
* so get column number and start iterating *)
let
val lineColumn = getCursorColumn (lineGap, cursorIdx)
in
helpViK
( strIdx - 1, strHd, cursorIdx - 1
, lineColumn, lineColumn, false
, leftStrings, lnHd, leftLines
)
end
else else
(* strIdx must be in the strTl *) (* strIdx must be in the strTl *)
(case (strTl, lnTl) of (case (strTl, lnTl) of
(nestStrHd :: nestStrTl, nestLnHd :: nestLnTl) => (nestStrHd :: nestStrTl, nestLnHd :: nestLnTl) =>
let let
val strIdx = strIdx - String.size strHd val strIdx = strIdx - String.size strHd
val leftStrings = strHd :: leftStrings
val leftLines = lnHd :: leftLines
in in
if String.sub (nestStrHd, strIdx) = #"\n" then startViK
if strIdx > 0 then ( lineGap, strIdx, nestStrHd, cursorIdx
(* if can check for double linebreak in nestStrHd *) , leftStrings, nestLnHd, leftLines
if String.sub (nestStrHd, strIdx - 1) = #"\n" then )
(* is in double linebreak *)
let
val leftStrings = strHd :: leftStrings
val leftLines = lnHd :: leftLines
in
helpVi0
( strIdx - 2, nestStrHd, cursorIdx - 2
, leftStrings, leftLines
)
end
else
(* is in single linebreak *)
helpVi0
( strIdx - 1, nestStrHd, cursorIdx - 1
, leftStrings, leftLines
)
else
(* must check strHd for second linebreak *)
if String.sub (strHd, String.size strHd - 1) = #"\n" then
(* is in double linebreak *)
helpVi0
( String.size strHd - 2, nestStrHd, cursorIdx - 2
, leftStrings, leftLines
)
else
(* is in single linebreak *)
helpVi0
( String.size strHd - 1, nestStrHd, cursorIdx - 1
, leftStrings, leftLines
)
else
(* not in linebreak *)
let
val lineColumn = getCursorColumn (lineGap, cursorIdx)
in
helpViK
( strIdx - 1, nestStrHd, cursorIdx - 1
, lineColumn, lineColumn, false
, strHd :: leftStrings
, nestLnHd
, lnHd :: leftLines
)
end
end end
| (_, _) => cursorIdx) | (_, _) => cursorIdx)
end end

BIN
shf
View File

Binary file not shown.