added support for gv in visual mode

Author: teslae1

src/actions/commands/visual.ts

@@ -13,6 +13,7 @@ class EnterVisualMode extends BaseCommand {
     if (vimState.currentMode === Mode.Normal && vimState.recordedState.count > 1) {
       vimState.cursorStopPosition = position.getRight(vimState.recordedState.count - 1);
     }
+    vimState.nextSelectionToUseForVisualGv = vimState.lastVisualSelection;
     await vimState.setCurrentMode(Mode.Visual);
   }
 }
@@ -75,15 +76,20 @@ class ExitVisualBlockMode extends BaseCommand {
 
 @RegisterAction
 class RestoreVisualSelection extends BaseCommand {
-  modes = [Mode.Normal];
+  modes = [Mode.Normal, Mode.Visual];
   keys = ['g', 'v'];
 
   public override async exec(position: Position, vimState: VimState): Promise<void> {
-    if (vimState.lastVisualSelection === undefined) {
+    let selectionFromHistoryToSelect = vimState.lastVisualSelection;
+    if (vimState.currentMode === Mode.Visual) {
+      selectionFromHistoryToSelect = vimState.nextSelectionToUseForVisualGv;
+      vimState.nextSelectionToUseForVisualGv = vimState.lastVisualSelection;
+    }
+    if (selectionFromHistoryToSelect === undefined) {
       return;
     }
 
-    let { start, end, mode } = vimState.lastVisualSelection;
+    let { start, end, mode } = selectionFromHistoryToSelect;
     if (mode !== Mode.Visual || !start.isEqual(end)) {
       if (end.line <= vimState.document.lineCount - 1) {
         if (mode === Mode.Visual && start.isBefore(end)) {

src/state/vimState.ts

@@ -209,6 +209,14 @@ export class VimState implements vscode.Disposable {
       }
     | undefined = undefined;
 
+  public nextSelectionToUseForVisualGv:
+    | {
+        mode: Mode.Visual | Mode.VisualLine | Mode.VisualBlock;
+        start: Position;
+        end: Position;
+      }
+    | undefined = undefined;
+
   /**
    * The current mode and its associated state.
    */