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

pass a failing test for 'dk' motion by decrementing newCursorLineNumber if the end of the deletion range is on a newline, and it is also the last char in the buffer

Browse Source
This commit is contained in:
Humza Shahid
2025-09-25 14:44:39 +01:00
parent 1494d5c356
commit 05abecc70d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fcore/normal-mode/make-normal-delete.sml
View File

@@ -559,16 +559,20 @@ struct
else else
let let
val endOfLine = Cursor.viDlr (buffer, cursorIdx, 1) val endOfLine = Cursor.viDlr (buffer, cursorIdx, 1)
val buffer = LineGap.goToIdx (endOfLine, buffer)
val endsOnNewline = Cursor.isCursorAtStartOfLine (buffer, endOfLine)
(* edge case: if cursor is on a newline, (* edge case: if cursor is on a newline,
* then we don't want to delete the newline * then we don't want to delete the newline
* as we are already deleting the newline * as we are already deleting the newline
* at the start of this range *) * at the start of this range *)
val buffer = LineGap.goToIdx (endOfLine, buffer) val endOfLine = if endsOnNewline then endOfLine else endOfLine + 1
val endOfLine =
if Cursor.isCursorAtStartOfLine (buffer, endOfLine) then endOfLine
else endOfLine + 1
val newCursorLineNumber =
if endsOnNewline andalso endOfLine = #textLength buffer - 1 then
newCursorLineNumber - 1
else
newCursorLineNumber
val buffer = LineGap.goToLine (newCursorLineNumber, buffer) val buffer = LineGap.goToLine (newCursorLineNumber, buffer)
val lineIdx = LineGap.lineNumberToIdx (newCursorLineNumber, buffer) val lineIdx = LineGap.lineNumberToIdx (newCursorLineNumber, buffer)