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

Adapt to immutable caret

Browse Source
This commit is contained in:
Alex Plate 2022-12-01 14:17:29 +02:00
parent ccb260b6a7
commit ec121fb327
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
1 changed files with 4 additions and 2 deletions

6
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimCaret.kt
View File

@ -94,18 +94,20 @@ per-caret marks.
// Make sure to always reposition the caret, even if the offset hasn't changed. We might need to reposition due to // Make sure to always reposition the caret, even if the offset hasn't changed. We might need to reposition due to
// changes in surrounding text, especially with inline inlays. // changes in surrounding text, especially with inline inlays.
val oldOffset = this.offset.point val oldOffset = this.offset.point
val caretAfterMove = moveToInlayAwareOffset(offset) var caretAfterMove = moveToInlayAwareOffset(offset)
// Similarly, always make sure the caret is positioned within the view. Adding or removing text could move the caret // Similarly, always make sure the caret is positioned within the view. Adding or removing text could move the caret
// position relative to the view, without changing offset. // position relative to the view, without changing offset.
if (this == editor.primaryCaret()) { if (this == editor.primaryCaret()) {
injector.motion.scrollCaretIntoView(editor) injector.motion.scrollCaretIntoView(editor)
} }
if (editor.inVisualMode || editor.inSelectMode) { caretAfterMove = if (editor.inVisualMode || editor.inSelectMode) {
// Another inconsistency with immutable caret. This method should be called on the new caret instance. // Another inconsistency with immutable caret. This method should be called on the new caret instance.
caretAfterMove.vimMoveSelectionToCaret(this.vimSelectionStart) caretAfterMove.vimMoveSelectionToCaret(this.vimSelectionStart)
editor.findLastVersionOfCaret(caretAfterMove) ?: caretAfterMove
} else { } else {
editor.exitVisualMode() editor.exitVisualMode()
caretAfterMove
} }
injector.motion.onAppCodeMovement(editor, this, offset, oldOffset) injector.motion.onAppCodeMovement(editor, this, offset, oldOffset)
return caretAfterMove return caretAfterMove