chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-08-08 00:40:37 +02:00
Code

Move caret when deleting a char

Browse Source 
In Fleet deleting text does not move caret, so we add caret moving logic
This commit is contained in:
Filipp Vakhitov 2024-09-10 02:07:44 +03:00 committed by Alex Pláte
parent f616f2c3c1
commit ad28e09fec
1 changed files with 8 additions and 6 deletions

14
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimChangeGroupBase.kt
View File

@ -112,23 +112,25 @@ abstract class VimChangeGroupBase : VimChangeGroup {
SelectionType.CHARACTER_WISE,
caret,
)
val pos = caret.offset
val norm = editor.normalizeOffset(caret.getBufferPosition().line, pos, isChange)
if (norm != pos ||
val pos = min(caret.offset, endOffset.offset)
val norm = editor.normalizeOffset(editor.offsetToBufferPosition(pos).line, pos, isChange)
val newCaret = if (norm != pos ||
editor.offsetToVisualPosition(norm) !==
injector.engineEditorHelper.inlayAwareOffsetToVisualPosition(editor, norm)
) {
caret.moveToOffset(norm)
} else {
caret
}
// Always move the caret. Our position might or might not have changed, but an inlay might have been moved to our
// location, or deleting the character(s) might have caused us to scroll sideways in long files. Moving the caret
// will make sure it's in the right place, and visible
val offset = editor.normalizeOffset(
caret.getBufferPosition().line,
caret.offset,
newCaret.getBufferPosition().line,
newCaret.offset,
isChange,
)
caret.moveToOffset(offset)
newCaret.moveToOffset(offset)
return res
}
return false