v$ should not include the EOL character

Fixes VSCodeVim#3970
stevenguh · Sep 1, 2019 · 92c3359 · 92c3359
1 parent f016da9
commit 92c3359
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/actions/motion.ts b/src/actions/motion.ts
@@ -836,7 +836,10 @@ class MoveLineEnd extends BaseMovement {
     vimState: VimState,
     count: number
   ): Promise<Position | IMovement> {
-    return position.getDownByCount(Math.max(count - 1, 0)).getLineEnd();
+    const pos = position.getDownByCount(Math.max(count - 1, 0)).getLineEnd();
+    return vimState.currentMode === ModeName.Visual || vimState.currentMode === ModeName.VisualBlock
+      ? pos.getLeftIfEOL()
+      : pos;
   }
 }
 

diff --git a/src/state/vimState.ts b/src/state/vimState.ts
@@ -201,7 +201,7 @@ export class VimState implements vscode.Disposable {
    */
   private _currentMode: ModeName = ModeName.Normal;
 
-  public get currentMode(): number {
+  public get currentMode(): ModeName {
     return this._currentMode;
   }