VSCodeVim/Vim
1
1
Fork 0
mirror of https://github.com/VSCodeVim/Vim.git synced 2024-11-10 10:58:33 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1717 from Chillee/1715

Browse Source 
Fixes #1715: Adds multicursor paste
This commit is contained in:
Horace He 2017-05-20 05:01:54 -04:00 committed by GitHub
commit 15df445409
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/actions/commands/actions.ts
View File

@ -1089,6 +1089,10 @@ export class PutCommand extends BaseCommand {
runsOnceForEachCountPrefix = true;
canBeRepeatedWithDot = true;
constructor(multicursorIndex?: number) {
super();
this.multicursorIndex = multicursorIndex;
}
public static async GetText(vimState: VimState, multicursorIndex: number | undefined = undefined): Promise<string> {
const register = await Register.get(vimState);
@ -1350,11 +1354,12 @@ export class PutCommandVisual extends BaseCommand {
// The reason we need to handle Delete and Yank separately is because of
// linewise mode. If we're in visualLine mode, then we want to copy
// linewise but not necessarily delete linewise.
let result = await new PutCommand().exec(start, vimState, true);
let result = await new PutCommand(this.multicursorIndex).exec(start, vimState, true);
result.currentRegisterMode = isLineWise ? RegisterMode.LineWise : RegisterMode.CharacterWise;
result = await new operator.YankOperator(this.multicursorIndex).run(result, start, end);
result.currentRegisterMode = RegisterMode.CharacterWise;
result = await new operator.DeleteOperator(this.multicursorIndex).run(result, start, end.getLeftIfEOL(), false);
result.currentRegisterMode = RegisterMode.FigureItOutFromCurrentMode;
return result;
}
@ -1771,6 +1776,7 @@ class CommandExitVisualMode extends BaseCommand {
class CommandVisualMode extends BaseCommand {
modes = [ModeName.Normal];
keys = ["v"];
isCompleteAction = false;
public async exec(position: Position, vimState: VimState): Promise<VimState> {
vimState.currentMode = ModeName.Visual;

34
src/mode/modeHandler.ts
View File

@ -1019,10 +1019,7 @@ export class ModeHandler implements vscode.Disposable {
}
ranRepeatableAction = (ranRepeatableAction && vimState.currentMode === ModeName.Normal) || this.createUndoPointForBrackets(vimState);
// Don't record an undo point for every action of a macro, only at the very end
ranAction = ranAction && vimState.currentMode === ModeName.Normal;
ranAction = ranAction && (vimState.currentMode === ModeName.Normal || vimState.currentMode === ModeName.Visual);
// Record down previous action and flush temporary state
if (ranRepeatableAction) {
@ -1033,6 +1030,20 @@ export class ModeHandler implements vscode.Disposable {
}
}
// Updated desired column
const movement = action instanceof BaseMovement ? action : undefined;
if ((movement && !movement.doesntChangeDesiredColumn) ||
(!movement && vimState.currentMode !== ModeName.VisualBlock)) {
// We check !operator here because e.g. d$ should NOT set the desired column to EOL.
if (movement && movement.setsDesiredColumnToEOL && !recordedState.operator) {
vimState.desiredColumn = Number.POSITIVE_INFINITY;
} else {
vimState.desiredColumn = vimState.cursorPosition.character;
}
}
if (ranAction) {
vimState.recordedState = new RecordedState();
@ -1106,21 +1117,6 @@ export class ModeHandler implements vscode.Disposable {
this._vimState.lastVisualSelectionEnd = this._vimState.cursorPosition;
}
// Updated desired column
const movement = action instanceof BaseMovement ? action : undefined;
if ((movement && !movement.doesntChangeDesiredColumn) ||
(recordedState.command &&
vimState.currentMode !== ModeName.VisualBlock)) {
// We check !operator here because e.g. d$ should NOT set the desired column to EOL.
if (movement && movement.setsDesiredColumnToEOL && !recordedState.operator) {
vimState.desiredColumn = Number.POSITIVE_INFINITY;
} else {
vimState.desiredColumn = vimState.cursorPosition.character;
}
}
// Make sure no two cursors are at the same location.
// This is a consequence of the fact that allCursors is not a Set.