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

Fix tests after reformat

Browse Source
This commit is contained in:
Alex Plate 2019-06-24 19:33:15 +03:00
parent aeef2f8948
commit 913e8c355b
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
3 changed files with 10 additions and 5 deletions
src/com/maddyhome/idea/vim
group
ChangeGroup.java
handler
ChangeEditorActionHandler.kt
helper
CaretData.kt

11
src/com/maddyhome/idea/vim/group/ChangeGroup.java
View File

@ -315,7 +315,7 @@ public class ChangeGroup {
* @return true if able to delete the text, false if not
*/
public boolean insertDeleteInsertedText(@NotNull Editor editor, @NotNull Caret caret) {
int deleteTo = CaretDataKt.getVimInsertStart(caret);
int deleteTo = CaretDataKt.getVimInsertStart(caret).getStartOffset();
int offset = caret.getOffset();
if (offset == deleteTo) {
deleteTo = VimPlugin.getMotion().moveCaretToLineStartSkipLeading(editor, caret);
@ -358,7 +358,7 @@ public class ChangeGroup {
final CaretModel caretModel = editor.getCaretModel();
for (Caret caret : caretModel.getAllCarets()) {
CaretDataKt.setVimInsertStart(caret, caret.getOffset());
CaretDataKt.setVimInsertStart(caret, editor.getDocument().createRangeMarker(caret.getOffset(), caret.getOffset()));
if (caret == caretModel.getPrimaryCaret()) {
VimPlugin.getMark().setMark(editor, MarkGroup.MARK_CHANGE_START, caret.getOffset());
}
@ -699,7 +699,7 @@ public class ChangeGroup {
strokes.clear();
repeatCharsCount = 0;
for (Caret caret : editor.getCaretModel().getAllCarets()) {
CaretDataKt.setVimInsertStart(caret, caret.getOffset());
CaretDataKt.setVimInsertStart(caret, editor.getDocument().createRangeMarker(caret.getOffset(), caret.getOffset()));
}
}
@ -772,7 +772,10 @@ public class ChangeGroup {
public boolean deleteEndOfLine(@NotNull Editor editor, @NotNull Caret caret, int count) {
int offset = VimPlugin.getMotion().moveCaretToLineEndOffset(editor, caret, count - 1, true);
if (offset != -1) {
boolean res = deleteText(editor, new TextRange(caret.getOffset(), offset), SelectionType.CHARACTER_WISE);
final TextRange rangeToDelete = new TextRange(caret.getOffset(), offset);
editor.getCaretModel().getAllCarets().stream().filter(c -> c != caret && rangeToDelete.contains(c.getOffset()))
.forEach(c -> editor.getCaretModel().removeCaret(c));
boolean res = deleteText(editor, rangeToDelete, SelectionType.CHARACTER_WISE);
int pos = VimPlugin.getMotion().moveCaretHorizontal(editor, caret, -1, false);
if (pos != -1) {
MotionGroup.moveCaret(editor, caret, pos);

1
src/com/maddyhome/idea/vim/handler/ChangeEditorActionHandler.kt
View File

@ -50,6 +50,7 @@ sealed class ChangeEditorActionHandler : VimActionHandler(false) {
when (this) {
is ForEachCaret -> {
editor.caretModel.runForEachCaret({ caret ->
if (!caret.isValid) return@runForEachCaret
if (!execute(editor, caret, context, cmd.count, cmd.rawCount, cmd.argument)) {
worked.set(false)
}

3
src/com/maddyhome/idea/vim/helper/CaretData.kt
View File

@ -21,6 +21,7 @@
package com.maddyhome.idea.vim.helper
import com.intellij.openapi.editor.Caret
import com.intellij.openapi.editor.RangeMarker
import com.intellij.openapi.util.Key
import com.maddyhome.idea.vim.group.visual.VisualChange
@ -57,4 +58,4 @@ var Caret.vimLastColumn: Int
//endregion
var Caret.vimLastVisualOperatorRange: VisualChange? by userDataCaretToEditor()
var Caret.vimInsertStart: Int by userDataOr { (this as Caret).offset }
var Caret.vimInsertStart: RangeMarker by userDataOr { (this as Caret).editor.document.createRangeMarker(this.offset, this.offset) }