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

add implementation of viK, completing hjkl movement keys

Browse Source
This commit is contained in:
Humza Shahid
2024-10-21 01:34:54 +01:00
parent d8e1c9d0fd
commit e08f2c4f77
3 changed files with 276 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fcore/app-update.sml
View File

@@ -69,10 +69,27 @@ struct
(newApp, drawMsg) (newApp, drawMsg)
end end
fun moveUp (app: app_type) =
let
val {buffer, windowWidth, windowHeight, startLine, cursorIdx, ...} = app
val buffer = LineGap.goToIdx (cursorIdx, buffer)
val cursorIdx = Cursor.viK (buffer, cursorIdx)
val buffer = LineGap.goToLine (startLine, buffer)
val drawMsg = TextBuilder.build
(startLine, cursorIdx, buffer, windowWidth, windowHeight)
val newApp = AppWith.bufferAndCursorIdx (app, buffer, cursorIdx)
in
(newApp, drawMsg)
end
fun handleChr (app: app_type, chr) = fun handleChr (app: app_type, chr) =
case chr of case chr of
#"h" => moveLeft app #"h" => moveLeft app
| #"j" => moveDown app | #"j" => moveDown app
| #"k" => moveUp app
| #"l" => moveRight app | #"l" => moveRight app
| _ => (app, []) | _ => (app, [])

328
fcore/cursor.sml
View File

@@ -297,80 +297,80 @@ struct
, lineColumn, preferredColumn, hasPassedLine , lineColumn, preferredColumn, hasPassedLine
, strTl, lineTl , strTl, lineTl
) = ) =
if strPos = String.size str then if strPos = String.size str then
helpViJList helpViJList
(absIdx, lineColumn, preferredColumn, hasPassedLine, strTl, lineTl) (absIdx, lineColumn, preferredColumn, hasPassedLine, strTl, lineTl)
else else
case String.sub (str, strPos) of case String.sub (str, strPos) of
#"\n" => #"\n" =>
if if
hasPassedLine hasPassedLine
then then
(* reached end of line twice, (* reached end of line twice,
* but line has fewer chars than preferredColumn * but line has fewer chars than preferredColumn
* note: if in double \n\n linebreak, * note: if in double \n\n linebreak,
* then return absIdx of second linebreak. *) * then return absIdx of second linebreak. *)
if strPos = String.size str - 1 then if strPos = String.size str - 1 then
if String.sub (str, strPos + 1) = #"\n" then if String.sub (str, strPos + 1) = #"\n" then
(* we are in double linebreak *) (* we are in double linebreak *)
absIdx + 1 absIdx + 1
else
(* not in double linebreak *)
absIdx - 1
else else
(* not in double linebreak *) (* this is last chr of string; must check string's tl next *)
absIdx - 1 (case strTl of
hd :: tl =>
if String.sub (hd, 0) = #"\n" then
(* in double linebreak *)
absIdx + 1
else
(* not in double linebreak *)
absIdx - 1
| [] =>
(* no more strings so return last idx *)
absIdx - 1)
else else
(* this is last chr of string; must check string's tl next *) (* reached end of line once;
(case strTl of * have to check if this is a double linebreak,
hd :: tl => * and return idx of second linebreak if so *)
if String.sub (hd, 0) = #"\n" then if strPos < String.size str - 1 then
(* in double linebreak *) if String.sub (str, strPos + 1) = #"\n" then
absIdx + 1 absIdx + 1
else else
(* not in double linebreak *) helpViJString
absIdx - 1 ( strPos + 1, str, absIdx + 1
| [] => , 0, preferredColumn, true
(* no more strings so return last idx *) , strTl, lineTl
absIdx - 1) )
else
(* reached end of line once;
* have to check if this is a double linebreak,
* and return idx of second linebreak if so *)
if strPos < String.size str - 1 then
if String.sub (str, strPos + 1) = #"\n" then
absIdx + 1
else else
helpViJString (* this is last chr of string; must check string's tl next *)
( strPos + 1, str, absIdx + 1 (case strTl of
, 0, preferredColumn, true hd :: tl =>
, strTl, lineTl if String.sub (hd, 0) = #"\n" then
) (* in double linebreak *)
absIdx + 1
else
(* not in double linebreak *)
helpViJString
( strPos + 1, str, absIdx + 1
, 0, preferredColumn, true
, strTl, lineTl
)
| [] =>
(* no more strings so return last idx *)
absIdx)
| _ =>
if lineColumn = preferredColumn andalso hasPassedLine then
(* we're at the preferredColumn so return absIdx *)
absIdx
else else
(* this is last chr of string; must check string's tl next *) (* we're not in the preferred column, so keep iterating *)
(case strTl of helpViJString
hd :: tl => ( strPos + 1, str, absIdx + 1
if String.sub (hd, 0) = #"\n" then , lineColumn + 1, preferredColumn, hasPassedLine
(* in double linebreak *) , strTl, lineTl
absIdx + 1 )
else
(* not in double linebreak *)
helpViJString
( strPos + 1, str, absIdx + 1
, 0, preferredColumn, true
, strTl, lineTl
)
| [] =>
(* no more strings so return last idx *)
absIdx)
| _ =>
if lineColumn = preferredColumn andalso hasPassedLine then
(* we're at the preferredColumn so return absIdx *)
absIdx
else
(* we're not in the preferred column, so keep iterating *)
helpViJString
( strPos + 1, str, absIdx + 1
, lineColumn + 1, preferredColumn, hasPassedLine
, strTl, lineTl
)
and helpViJList and helpViJList
(absIdx, lineColumn, preferredColumn, hasPassedLine, strings, lines) = (absIdx, lineColumn, preferredColumn, hasPassedLine, strings, lines) =
@@ -458,4 +458,192 @@ struct
(* nowhere to go rightward, so return cursorIdx *) (* nowhere to go rightward, so return cursorIdx *)
cursorIdx cursorIdx
end end
fun helpViKString
( strPos, str, absIdx
, lineColumn, preferredColumn, hasPassedLine
, strTl, lineHd, lineTl
) =
if strPos < 0 then
helpViKList
(absIdx, lineColumn, preferredColumn, hasPassedLine, strTl, lineTl)
else
case String.sub (str, strPos) of
#"\n" =>
if
hasPassedLine
then
(* reached end of line twice,
* but line has fewer chars than preferredColumn
* note: if in double \n\n linebreak,
* then return absIdx of second linebreak. *)
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
(* reached start of line once;
* have to check if this is a double linebreak,
* and return idx of second linebreak if so *)
if strPos > 0 then
if String.sub (str, strPos - 1) = #"\n" then
absIdx
else
let
(* have to calculate column of current line
* so we know which line to stop searching at *)
val lineColumn =
helpGetCursorColumnBranch
(strPos - 1, str, lineHd, strTl, lineTl)
in
helpViKString
( strPos - 1, str, absIdx - 1
, 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
helpViKString
( 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
(* We're at or before the preferredColumn so return absIdx
* context: current line may have fewer columns
* than our preferred column value.
* If this is the case, we want to check
* "is lineColumn equal to or before preferredColumn?". *)
absIdx
else
(* we're not in the preferred column, so keep iterating *)
helpViKString
( strPos - 1, str, absIdx - 1
, lineColumn - 1, preferredColumn, hasPassedLine
, strTl, lineHd, lineTl
)
and helpViKList
(absIdx, lineColumn, preferredColumn, hasPassedLine, strings, lines) =
case (strings, lines) of
(strHd :: strTl, lineHd :: lineTl) =>
(* todo: possibly check if we have passed line,
* and if so, if there are any line breaks in the lineHd
* which we could use to skip searching part of the string.
* However, this will likely have worse cache locality
* as we switch to searching in string to searcing in line vector
* so perhaps not. *)
helpViKString
( String.size strHd - 1, strHd, absIdx
, lineColumn, preferredColumn, hasPassedLine
, strTl, lineHd, lineTl
)
| (_, _) =>
(* empty, so return start of previous string *)
absIdx + 1
fun viK (lineGap: LineGap.t, cursorIdx) =
let
val
{rightStrings, idx = bufferIdx, rightLines, leftStrings, leftLines, ...} =
lineGap
in
case (rightStrings, rightLines) of
(strHd :: strTl, lnHd :: lnTl) =>
let
(* convert absolute cursorIdx to idx relative to hd string *)
val strIdx = cursorIdx - bufferIdx
in
if strIdx < String.size strHd then
(* strIdx is in this string *)
if String.sub (strHd, strIdx) = #"\n" then
(* if we are at a newline
* note:
* don't need to check if we are a double linebreak,
* because cursor navigation functions already check
* for that condition at the end.
* So there is no way at the start of a navigation function
* that cursor is in a double linebreak incorrectly. *)
helpViKString
(strIdx - 1, strHd, cursorIdx - 1, 0, 0, true, strTl, lnHd, lnTl)
else
(* not at newline
* so get column number and start iterating *)
let
val lineColumn = getCursorColumn (lineGap, cursorIdx)
in
helpViKString
( strIdx - 1, strHd, cursorIdx - 1
, lineColumn, lineColumn, false
, strTl, lnHd, lnTl
)
end
else
(* strIdx must be in the strTl *)
(case (strTl, lnTl) of
(nestStrHd :: _, nestLnHd :: _) =>
let
val strIdx = strIdx - String.size strHd
val leftStrings = strHd :: leftStrings
val leftLines = lnHd :: leftLines
in
if String.sub (nestStrHd, strIdx) = #"\n" then
helpViKString
( strIdx - 1, nestStrHd, cursorIdx - 1
, 0, 0, true
, leftStrings, nestLnHd, leftLines
)
else
(* not in linebreak *)
let
val lineColumn = getCursorColumn (lineGap, cursorIdx)
in
helpViKString
( strIdx - 1, nestStrHd, cursorIdx - 1
, lineColumn, lineColumn, false
, leftStrings, nestLnHd, leftLines
)
end
end
| (_, _) => cursorIdx)
end
| (_, _) =>
(* nowhere to go rightward, so return cursorIdx *)
cursorIdx
end
end end

BIN
shf
View File

Binary file not shown.