rename 'NormalDelete.deleteLineBack' function to 'NormalDelete.deleteLineUp' which is clearer ('k' in 'dk' motion means move cursor up one line)
This commit is contained in:
@@ -584,7 +584,7 @@ struct
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
fun finishDeleteLineBack (app, buffer, lineIdx, length, endOfLine, time) =
|
fun finishDeleteLineUp (app, buffer, lineIdx, length, endOfLine, time) =
|
||||||
if endOfLine >= #textLength buffer - 2 then
|
if endOfLine >= #textLength buffer - 2 then
|
||||||
(* deleting from last line *)
|
(* deleting from last line *)
|
||||||
let
|
let
|
||||||
@@ -632,7 +632,7 @@ struct
|
|||||||
finishAfterDeletingBuffer (app, newCursorIdx, buffer, time, initialMsg)
|
finishAfterDeletingBuffer (app, newCursorIdx, buffer, time, initialMsg)
|
||||||
end
|
end
|
||||||
|
|
||||||
fun deleteLineBack (app: app_type, count, time) =
|
fun deleteLineUp (app: app_type, count, time) =
|
||||||
let
|
let
|
||||||
val {buffer, cursorIdx, ...} = app
|
val {buffer, cursorIdx, ...} = app
|
||||||
val buffer = LineGap.goToIdx (cursorIdx, buffer)
|
val buffer = LineGap.goToIdx (cursorIdx, buffer)
|
||||||
@@ -662,7 +662,7 @@ struct
|
|||||||
else
|
else
|
||||||
endOfLine + 2
|
endOfLine + 2
|
||||||
in
|
in
|
||||||
finishDeleteLineBack (app, buffer, 0, endOfLine, endOfLine, time)
|
finishDeleteLineUp (app, buffer, 0, endOfLine, endOfLine, time)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
let
|
let
|
||||||
@@ -686,7 +686,7 @@ struct
|
|||||||
val lineIdx = LineGap.lineNumberToIdx (newCursorLineNumber, buffer)
|
val lineIdx = LineGap.lineNumberToIdx (newCursorLineNumber, buffer)
|
||||||
val length = endOfLine - lineIdx
|
val length = endOfLine - lineIdx
|
||||||
in
|
in
|
||||||
finishDeleteLineBack (app, buffer, lineIdx, length, endOfLine, time)
|
finishDeleteLineUp (app, buffer, lineIdx, length, endOfLine, time)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -265,7 +265,7 @@ struct
|
|||||||
* so their implementation differs from
|
* so their implementation differs from
|
||||||
* other cursor motions *)
|
* other cursor motions *)
|
||||||
| #"j" => NormalDelete.deleteLineDown (app, count, time)
|
| #"j" => NormalDelete.deleteLineDown (app, count, time)
|
||||||
| #"k" => NormalDelete.deleteLineBack (app, count, time)
|
| #"k" => NormalDelete.deleteLineUp (app, count, time)
|
||||||
| #"w" => NormalDelete.deleteWord (app, count, time)
|
| #"w" => NormalDelete.deleteWord (app, count, time)
|
||||||
| #"W" => NormalDelete.deleteWORD (app, count, time)
|
| #"W" => NormalDelete.deleteWORD (app, count, time)
|
||||||
| #"b" => NormalDelete.deleteByDfa (app, count, Cursor.prevWord, time)
|
| #"b" => NormalDelete.deleteByDfa (app, count, Cursor.prevWord, time)
|
||||||
@@ -365,7 +365,7 @@ struct
|
|||||||
* so their implementation differs from
|
* so their implementation differs from
|
||||||
* other cursor motions *)
|
* other cursor motions *)
|
||||||
| #"j" => NormalYankDelete.deleteLineDown (app, count, time)
|
| #"j" => NormalYankDelete.deleteLineDown (app, count, time)
|
||||||
| #"k" => NormalYankDelete.deleteLineBack (app, count, time)
|
| #"k" => NormalYankDelete.deleteLineUp (app, count, time)
|
||||||
| #"w" => NormalYankDelete.deleteWord (app, count, time)
|
| #"w" => NormalYankDelete.deleteWord (app, count, time)
|
||||||
| #"W" => NormalYankDelete.deleteWORD (app, count, time)
|
| #"W" => NormalYankDelete.deleteWORD (app, count, time)
|
||||||
| #"b" => NormalYankDelete.deleteByDfa (app, count, Cursor.prevWord, time)
|
| #"b" => NormalYankDelete.deleteByDfa (app, count, Cursor.prevWord, time)
|
||||||
|
|||||||
Reference in New Issue
Block a user