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

Multiple carets support for put text instead of visual block

Browse Source
This commit is contained in:
Vitalii Karavaev 2018-07-12 17:32:50 +03:00
parent bdc1103641
commit ae61ed456f
4 changed files with 69 additions and 64 deletions

11
src/com/maddyhome/idea/vim/action/copy/PutVisualTextAction.java
View File

@ -19,12 +19,14 @@
package com.maddyhome.idea.vim.action.copy;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.action.VimCommandAction;
import com.maddyhome.idea.vim.command.Command;
import com.maddyhome.idea.vim.command.MappingMode;
import com.maddyhome.idea.vim.common.TextRange;
import com.maddyhome.idea.vim.handler.CaretOrder;
import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
import org.jetbrains.annotations.NotNull;
@ -37,10 +39,11 @@ import java.util.Set;
*/
public class PutVisualTextAction extends VimCommandAction {
public PutVisualTextAction() {
super(new VisualOperatorActionHandler() {
protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
@NotNull TextRange range) {
return VimPlugin.getCopy().putVisualRange(editor, context, range, cmd.getCount(), true, false);
super(new VisualOperatorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
@Override
protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
@NotNull Command cmd, @NotNull TextRange range) {
return VimPlugin.getCopy().putVisualRange(editor, caret, context, range, cmd.getCount(), true, false);
}
});
}

12
src/com/maddyhome/idea/vim/action/copy/PutVisualTextMoveCursorAction.java
View File

@ -19,12 +19,15 @@
package com.maddyhome.idea.vim.action.copy;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.action.VimCommandAction;
import com.maddyhome.idea.vim.command.Command;
import com.maddyhome.idea.vim.command.MappingMode;
import com.maddyhome.idea.vim.common.TextRange;
import com.maddyhome.idea.vim.handler.CaretOrder;
import com.maddyhome.idea.vim.handler.ExecuteMethodNotOverriddenException;
import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler;
import org.jetbrains.annotations.NotNull;
@ -37,10 +40,11 @@ import java.util.Set;
*/
public class PutVisualTextMoveCursorAction extends VimCommandAction {
public PutVisualTextMoveCursorAction() {
super(new VisualOperatorActionHandler() {
protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
@NotNull TextRange range) {
return VimPlugin.getCopy().putVisualRange(editor, context, range, cmd.getCount(), true, true);
super(new VisualOperatorActionHandler(true, CaretOrder.DECREASING_OFFSET) {
@Override
protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
@NotNull Command cmd, @NotNull TextRange range) throws ExecuteMethodNotOverriddenException {
return VimPlugin.getCopy().putVisualRange(editor, caret, context, range, cmd.getCount(), true, true);
}
});
}

8
src/com/maddyhome/idea/vim/action/copy/PutVisualTextNoIndentAction.java
View File

@ -19,6 +19,7 @@
package com.maddyhome.idea.vim.action.copy;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.action.VimCommandAction;
@ -38,9 +39,10 @@ import java.util.Set;
public class PutVisualTextNoIndentAction extends VimCommandAction {
public PutVisualTextNoIndentAction() {
super(new VisualOperatorActionHandler() {
protected boolean execute(@NotNull Editor editor, @NotNull DataContext context, @NotNull Command cmd,
@NotNull TextRange range) {
return VimPlugin.getCopy().putVisualRange(editor, context, range, cmd.getCount(), false, false);
@Override
protected boolean execute(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
@NotNull Command cmd, @NotNull TextRange range) {
return VimPlugin.getCopy().putVisualRange(editor, caret, context, range, cmd.getCount(), false, false);
}
});
}

102
src/com/maddyhome/idea/vim/group/CopyGroup.java
View File

@ -198,62 +198,59 @@ public class CopyGroup {
return true;
}
public boolean putVisualRange(@NotNull Editor editor, @NotNull DataContext context, @NotNull TextRange range,
int count, boolean indent, boolean cursorAfter) {
CommandState.SubMode subMode = CommandState.getInstance(editor).getSubMode();
Register reg = VimPlugin.getRegister().getLastRegister();
// Without this reset, the deleted text goes into the same register we just pasted from.
VimPlugin.getRegister().resetRegister();
if (reg != null) {
final SelectionType type = reg.getType();
if (type == SelectionType.LINE_WISE && editor.isOneLineMode()) {
return false;
}
int start = range.getStartOffset();
int end = range.getEndOffset();
int endLine = editor.offsetToLogicalPosition(end).line;
if (logger.isDebugEnabled()) {
logger.debug("start=" + start);
logger.debug("end=" + end);
}
if (subMode == CommandState.SubMode.VISUAL_LINE) {
range =
new TextRange(range.getStartOffset(), Math.min(range.getEndOffset() + 1, EditorHelper.getFileSize(editor)));
}
VimPlugin.getChange()
.deleteRange(editor, editor.getCaretModel().getPrimaryCaret(), range, SelectionType.fromSubMode(subMode),
false);
editor.getCaretModel().moveToOffset(start);
int pos = start;
if (type == SelectionType.LINE_WISE) {
if (subMode == CommandState.SubMode.VISUAL_BLOCK) {
pos = editor.getDocument().getLineEndOffset(endLine) + 1;
}
else if (subMode != CommandState.SubMode.VISUAL_LINE) {
editor.getDocument().insertString(start, "\n");
pos = start + 1;
}
}
else if (type != SelectionType.CHARACTER_WISE) {
if (subMode == CommandState.SubMode.VISUAL_LINE) {
editor.getDocument().insertString(start, "\n");
}
}
putText(editor, context, pos, StringUtil.notNullize(reg.getText()), type, count,
indent && type == SelectionType.LINE_WISE, cursorAfter, subMode);
return true;
public boolean putVisualRange(@NotNull Editor editor, @NotNull Caret caret, @NotNull DataContext context,
@NotNull TextRange range, int count, boolean indent, boolean cursorAfter) {
final Register register = VimPlugin.getRegister().getLastRegister();
if (register == null) {
return false;
}
final SelectionType selectionType = register.getType();
if (selectionType == SelectionType.LINE_WISE && editor.isOneLineMode()) {
return false;
}
return false;
final CommandState.SubMode subMode = CommandState.getInstance(editor).getSubMode();
if (subMode == CommandState.SubMode.VISUAL_LINE) {
range = new TextRange(range.getStartOffset(), Math.min(range.getEndOffset() + 1, EditorHelper.getFileSize(editor)));
}
VimPlugin.getChange().deleteRange(editor, caret, range, SelectionType.fromSubMode(subMode), false);
int startOffset = range.getStartOffset();
if (selectionType == SelectionType.LINE_WISE) {
if (subMode == CommandState.SubMode.VISUAL_BLOCK) {
startOffset = editor.getDocument().getLineEndOffset(range.getEndOffset()) + 1;
}
else if (subMode != CommandState.SubMode.VISUAL_LINE) {
editor.getDocument().insertString(startOffset, "\n");
++startOffset;
}
}
else if (selectionType != SelectionType.CHARACTER_WISE) {
if (subMode == CommandState.SubMode.VISUAL_LINE) {
editor.getDocument().insertString(startOffset, "\n");
}
}
final String text = indent ?
StringUtil.notNullize(register.getText()) :
removeLeadingSpaces(StringUtil.notNullize(register.getText()));
final int endOffset = selectionType == SelectionType.BLOCK_WISE ?
putTextBlockwise(editor, caret, text, count, startOffset) :
putText(editor, caret, text, count, startOffset);
VimPlugin.getRegister().storeText(editor, new TextRange(startOffset, startOffset + (endOffset - startOffset) / count),
selectionType, false);
moveCursorToOffset(editor, caret, selectionType, startOffset, endOffset, cursorAfter);
return true;
}
public boolean putVisualRange(@NotNull Editor editor, @NotNull DataContext context, @NotNull TextRange range,
int count, boolean indent, boolean cursorAfter) {
return putVisualRange(editor, editor.getCaretModel().getPrimaryCaret(), context, range, count, indent, cursorAfter);
}
@NotNull
private String removeLeadingSpaces(@NotNull String s) {
@ -400,7 +397,6 @@ public class CopyGroup {
public void putText(@NotNull Editor editor, @NotNull DataContext context, int offset, @NotNull String text,
@NotNull SelectionType type, int count, boolean indent, boolean cursorAfter,
@NotNull CommandState.SubMode mode) {
// TODO: Add multiple carets support
if (logger.isDebugEnabled()) {
logger.debug("offset=" + offset);
logger.debug("type=" + type);