make 'dW' motion use transition function that is specific for deleting, and add a test to ensure that 'dW' does not delete a newline when it is not on a newline character
This commit is contained in:
@@ -341,6 +341,20 @@ struct
|
||||
deleteAndFinish (app, cursorIdx, length, buffer, time)
|
||||
end
|
||||
|
||||
fun deleteWORD (app as {buffer, ...}: app_type, count, time) =
|
||||
if #textLength buffer = 1 then
|
||||
NormalFinish.clearMode app
|
||||
else
|
||||
let
|
||||
val {buffer, cursorIdx, ...} = app
|
||||
|
||||
val buffer = LineGap.goToIdx (cursorIdx, buffer)
|
||||
val high = Cursor.nextWORDForDelete (buffer, cursorIdx, count)
|
||||
val length = high - cursorIdx
|
||||
in
|
||||
deleteAndFinish (app, cursorIdx, length, buffer, time)
|
||||
end
|
||||
|
||||
fun deleteByDfa (app as {buffer, ...}: app_type, count, fMove, time) =
|
||||
if #textLength buffer = 1 then
|
||||
NormalFinish.clearMode app
|
||||
|
||||
@@ -258,7 +258,7 @@ struct
|
||||
| #"j" => NormalDelete.deleteLineDown (app, count, time)
|
||||
| #"k" => NormalDelete.deleteLineBack (app, count, time)
|
||||
| #"w" => NormalDelete.deleteWord (app, count, time)
|
||||
| #"W" => NormalDelete.deleteByDfa (app, count, Cursor.nextWORD, time)
|
||||
| #"W" => NormalDelete.deleteWORD (app, count, time)
|
||||
| #"b" => NormalDelete.deleteByDfa (app, count, Cursor.prevWord, time)
|
||||
| #"B" => NormalDelete.deleteByDfa (app, count, Cursor.prevWORD, time)
|
||||
| #"e" =>
|
||||
@@ -347,7 +347,7 @@ struct
|
||||
| #"j" => NormalYankDelete.deleteLineDown (app, count, time)
|
||||
| #"k" => NormalYankDelete.deleteLineBack (app, count, time)
|
||||
| #"w" => NormalYankDelete.deleteWord (app, count, time)
|
||||
| #"W" => NormalYankDelete.deleteByDfa (app, count, Cursor.nextWORD, time)
|
||||
| #"W" => NormalYankDelete.deleteWORD (app, count, time)
|
||||
| #"b" => NormalYankDelete.deleteByDfa (app, count, Cursor.prevWord, time)
|
||||
| #"B" => NormalYankDelete.deleteByDfa (app, count, Cursor.prevWORD, time)
|
||||
| #"e" =>
|
||||
|
||||
Reference in New Issue
Block a user