Make VisualLine and VisualBlock modes work with multiple cursors

src/actions/commands/actions.ts

@@ -865,7 +865,7 @@ class CommandOverrideCopy extends BaseCommand {
         })
         .join('\n');
     } else if (vimState.currentMode === Mode.VisualBlock) {
-      for (const { line } of Position.IterateLine(vimState)) {
+      for (const { line } of Position.IterateLinesInBlock(vimState)) {
         text += line + '\n';
       }
     } else if (vimState.currentMode === Mode.Insert || vimState.currentMode === Mode.Normal) {
@@ -3486,7 +3486,7 @@ class ActionReplaceCharacterVisualBlock extends BaseCommand {
       toInsert = TextEditor.getTabCharacter(vimState.editor);
     }
 
-    for (const { start, end } of Position.IterateLine(vimState)) {
+    for (const { start, end } of Position.IterateLinesInBlock(vimState)) {
       if (end.isBeforeOrEqual(start)) {
         continue;
       }
@@ -3524,7 +3524,7 @@ class ActionDeleteVisualBlock extends BaseCommand {
   public async exec(position: Position, vimState: VimState): Promise<VimState> {
     const lines: string[] = [];
 
-    for (const { line, start, end } of Position.IterateLine(vimState)) {
+    for (const { line, start, end } of Position.IterateLinesInBlock(vimState)) {
       lines.push(line);
       vimState.recordedState.transformations.push({
         type: 'deleteRange',
@@ -3560,7 +3560,7 @@ class ActionShiftDVisualBlock extends BaseCommand {
   mightChangeDocument = true;
 
   public async exec(position: Position, vimState: VimState): Promise<VimState> {
-    for (const { start } of Position.IterateLine(vimState)) {
+    for (const { start } of Position.IterateLinesInBlock(vimState)) {
       vimState.recordedState.transformations.push({
         type: 'deleteRange',
         range: new Range(start, start.getLineEnd()),
@@ -3593,7 +3593,7 @@ class ActionGoToInsertVisualBlockMode extends BaseCommand {
     vimState.isMultiCursor = true;
     vimState.isFakeMultiCursor = true;
 
-    for (const { line, start } of Position.IterateLine(vimState)) {
+    for (const { line, start } of Position.IterateLinesInBlock(vimState)) {
       if (line === '' && start.character !== 0) {
         continue;
       }
@@ -3614,7 +3614,7 @@ class ActionChangeInVisualBlockMode extends BaseCommand {
   }
 
   public async exec(position: Position, vimState: VimState): Promise<VimState> {
-    for (const { start, end } of Position.IterateLine(vimState)) {
+    for (const { start, end } of Position.IterateLinesInBlock(vimState)) {
       vimState.recordedState.transformations.push({
         type: 'deleteRange',
         range: new Range(start, end),
@@ -3626,7 +3626,7 @@ class ActionChangeInVisualBlockMode extends BaseCommand {
     vimState.isMultiCursor = true;
     vimState.isFakeMultiCursor = true;
 
-    for (const { start } of Position.IterateLine(vimState)) {
+    for (const { start } of Position.IterateLinesInBlock(vimState)) {
       vimState.cursors.push(new Range(start, start));
     }
     vimState.cursors = vimState.cursors.slice(1);
@@ -3645,7 +3645,7 @@ class ActionChangeToEOLInVisualBlockMode extends BaseCommand {
   }
 
   public async exec(position: Position, vimState: VimState): Promise<VimState> {
-    for (const { start } of Position.IterateLine(vimState)) {
+    for (const { start } of Position.IterateLinesInBlock(vimState)) {
       vimState.recordedState.transformations.push({
         type: 'deleteRange',
         range: new Range(start, start.getLineEnd()),
@@ -3657,7 +3657,7 @@ class ActionChangeToEOLInVisualBlockMode extends BaseCommand {
     vimState.isMultiCursor = true;
     vimState.isFakeMultiCursor = true;
 
-    for (const { end } of Position.IterateLine(vimState)) {
+    for (const { end } of Position.IterateLinesInBlock(vimState)) {
       vimState.cursors.push(new Range(end, end));
     }
     vimState.cursors = vimState.cursors.slice(1);
@@ -3776,7 +3776,7 @@ class ActionGoToInsertVisualBlockModeAppend extends BaseCommand {
     vimState.isMultiCursor = true;
     vimState.isFakeMultiCursor = true;
 
-    for (const { line, end } of Position.IterateLine(vimState)) {
+    for (const { line, end } of Position.IterateLinesInBlock(vimState)) {
       if (line.trim() === '') {
         vimState.recordedState.transformations.push({
           type: 'replaceText',

src/actions/operator.ts

@@ -425,7 +425,7 @@ class UpperCaseVisualBlockOperator extends BaseOperator {
   public modes = [Mode.VisualBlock];
 
   public async run(vimState: VimState, startPos: Position, endPos: Position): Promise<VimState> {
-    for (const { start, end } of Position.IterateLine(vimState)) {
+    for (const { start, end } of Position.IterateLinesInBlock(vimState)) {
       const range = new vscode.Range(start, end);
       let text = vimState.editor.document.getText(range);
       await TextEditor.replace(range, text.toUpperCase());
@@ -470,7 +470,7 @@ class LowerCaseVisualBlockOperator extends BaseOperator {
   public modes = [Mode.VisualBlock];
 
   public async run(vimState: VimState, startPos: Position, endPos: Position): Promise<VimState> {
-    for (const { start, end } of Position.IterateLine(vimState)) {
+    for (const { start, end } of Position.IterateLinesInBlock(vimState)) {
       const range = new vscode.Range(start, end);
       let text = vimState.editor.document.getText(range);
       await TextEditor.replace(range, text.toLowerCase());
@@ -687,7 +687,7 @@ export class YankVisualBlockMode extends BaseOperator {
 
     const isMultiline = startPos.line !== endPos.line;
 
-    for (const { line, start, end } of Position.IterateLine(vimState)) {
+    for (const { line, start, end } of Position.IterateLinesInBlock(vimState)) {
       ranges.push(new vscode.Range(start, end));
       if (isMultiline) {
         toCopy += line + '\n';
@@ -755,7 +755,7 @@ class ToggleCaseVisualBlockOperator extends BaseOperator {
   public modes = [Mode.VisualBlock];
 
   public async run(vimState: VimState, startPos: Position, endPos: Position): Promise<VimState> {
-    for (const { start, end } of Position.IterateLine(vimState)) {
+    for (const { start, end } of Position.IterateLinesInBlock(vimState)) {
       const range = new vscode.Range(start, end);
       await ToggleCaseOperator.toggleCase(range);
     }

src/common/motion/position.ts

@@ -6,6 +6,7 @@ import { configuration } from './../../configuration/configuration';
 import { TextEditor } from './../../textEditor';
 import { visualBlockGetTopLeftPosition, visualBlockGetBottomRightPosition } from '../../mode/mode';
 import { clamp } from '../../util/util';
+import { Range } from './range';
 
 /**
  * Controls how a PositionDiff affects the Position it's applied to.
@@ -211,28 +212,30 @@ export class Position extends vscode.Position {
   }
 
   /**
-   * Iterate over every line in the block defined by the two positions passed in.
+   * Iterate over every line in the block defined by the two positions (Range) passed in.
+   * If no range is given, the primary cursor will be used as the block.
    *
    * This is intended for visual block mode.
    */
-  public static *IterateLine(
+  public static *IterateLinesInBlock(
     vimState: VimState,
+    range?: Range,
     options: { reverse?: boolean } = { reverse: false }
   ): Iterable<{ line: string; start: Position; end: Position }> {
     const { reverse } = options;
-    const start = vimState.cursorStartPosition;
-    const stop = vimState.cursorStopPosition;
 
-    const topLeft = visualBlockGetTopLeftPosition(start, stop);
-    const bottomRight = visualBlockGetBottomRightPosition(start, stop);
+    if (range === undefined) {
+      range = vimState.cursors[0];
+    }
 
-    // Special case for $, which potentially makes the block ragged
-    // on the right side.
-    const runToLineEnd = vimState.desiredColumn === Number.POSITIVE_INFINITY;
+    const topLeft = visualBlockGetTopLeftPosition(range.start, range.stop);
+    const bottomRight = visualBlockGetBottomRightPosition(range.start, range.stop);
 
     const itrStart = reverse ? bottomRight.line : topLeft.line;
     const itrEnd = reverse ? topLeft.line : bottomRight.line;
 
+    const runToLineEnd = vimState.desiredColumn === Number.POSITIVE_INFINITY;
+
     for (
       let lineIndex = itrStart;
       reverse ? lineIndex >= itrEnd : lineIndex <= itrEnd;

src/mode/modeHandler.ts

@@ -938,7 +938,9 @@ export class ModeHandler implements vscode.Disposable {
             );
 
             if (!nextMatch) {
-              throw VimError.fromCode(command.direction > 0 ? ErrorCode.SearchHitBottom : ErrorCode.SearchHitTop);
+              throw VimError.fromCode(
+                command.direction > 0 ? ErrorCode.SearchHitBottom : ErrorCode.SearchHitTop
+              );
             }
 
             vimState.cursorStopPosition = nextMatch.pos;
@@ -1264,7 +1266,7 @@ export class ModeHandler implements vscode.Disposable {
         } else if (selectionMode === Mode.VisualBlock) {
           selections = [];
 
-          for (const { start: lineStart, end } of Position.IterateLine(vimState)) {
+          for (const { start: lineStart, end } of Position.IterateLinesInBlock(vimState)) {
             selections.push(new vscode.Selection(lineStart, end));
           }
         } else {
@@ -1284,6 +1286,20 @@ export class ModeHandler implements vscode.Disposable {
             }
             break;
           }
+          case Mode.VisualLine: {
+            selections = vimState.cursors.map((c: Range) => {
+              return new vscode.Selection(c.start.getLineBegin(), c.stop.getLineEnd());
+            });
+            break;
+          }
+          case Mode.VisualBlock: {
+            for (const c of vimState.cursors) {
+              for (const { start: lineStart, end } of Position.IterateLinesInBlock(vimState, c)) {
+                selections.push(new vscode.Selection(lineStart, end));
+              }
+            }
+            break;
+          }
           case Mode.Normal:
           case Mode.Insert: {
             for (const { stop: cursorStop } of vimState.cursors) {

src/state/vimState.ts

@@ -53,6 +53,7 @@ export class VimState implements vscode.Disposable {
   /**
    * Are multiple cursors currently present?
    */
+  // TODO: why isn't this a function?
   public isMultiCursor = false;
 
   /**

src/textEditor.ts

@@ -33,7 +33,7 @@ export class TextEditor {
     text: string,
     at: Position | undefined = undefined,
     letVSCodeHandleKeystrokes: boolean | undefined = undefined
-  ): Promise<boolean> {
+  ): Promise<void> {
     // If we insert "blah(" with default:type, VSCode will insert the closing ).
     // We *probably* don't want that to happen if we're inserting a lot of text.
     if (letVSCodeHandleKeystrokes === undefined) {
@@ -56,8 +56,6 @@ export class TextEditor {
     } else {
       await vscode.commands.executeCommand('default:type', { text });
     }
-
-    return true;
   }
 
   /**
@@ -69,6 +67,9 @@ export class TextEditor {
     });
   }
 
+  /**
+   * @deprecated Use DeleteTextTransformation or DeleteTextRangeTransformation instead.
+   */
   static async delete(range: vscode.Range): Promise<boolean> {
     return vscode.window.activeTextEditor!.edit(editBuilder => {
       editBuilder.delete(range);