refactor: remove lastClickWasPastEol from vim state

VSCodeVim · Feb 19, 2018 · a2023fd · a2023fd
1 parent b88c38d
commit a2023fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -181,14 +181,15 @@ export class ModeHandler implements vscode.Disposable {
     }
 
     let toDraw = false;
+    let isLastClickPastEol = false;
 
     if (selection) {
       let newPosition = new Position(selection.active.line, selection.active.character);
 
       // Only check on a click, not a full selection (to prevent clicking past EOL)
       if (newPosition.character >= newPosition.getLineEnd().character && selection.isEmpty) {
         if (this.vimState.currentMode !== ModeName.Insert) {
-          this.vimState.lastClickWasPastEol = true;
+          isLastClickPastEol = true;
 
           // This prevents you from mouse clicking past the EOL
           newPosition = new Position(
@@ -201,16 +202,13 @@ export class ModeHandler implements vscode.Disposable {
 
           toDraw = true;
         }
-      } else if (selection.isEmpty) {
-        this.vimState.lastClickWasPastEol = false;
       }
 
       this.vimState.cursorPosition = newPosition;
       this.vimState.cursorStartPosition = newPosition;
       this.vimState.desiredColumn = newPosition.character;
 
       // start visual mode?
-
       if (
         selection.anchor.line === selection.active.line &&
         selection.anchor.character >= newPosition.getLineEnd().character - 1 &&
@@ -231,11 +229,10 @@ export class ModeHandler implements vscode.Disposable {
         }
 
         // If we prevented from clicking past eol but it is part of this selection, include the last char
-        if (this.vimState.lastClickWasPastEol) {
+        if (isLastClickPastEol) {
           const newStart = new Position(selection.anchor.line, selection.anchor.character + 1);
           this.vimState.editor.selection = new vscode.Selection(newStart, selection.end);
           this.vimState.cursorStartPosition = selectionStart;
-          this.vimState.lastClickWasPastEol = false;
         }
 
         if (

diff --git a/src/state/vimState.ts b/src/state/vimState.ts
@@ -172,11 +172,6 @@ export class VimState implements vscode.Disposable {
   public lastVisualSelectionStart: Position;
   public lastVisualSelectionEnd: Position;
 
-  /**
-   * Was the previous mouse click past EOL
-   */
-  public lastClickWasPastEol: boolean = false;
-
   /**
    * The mode Vim will be in once this action finishes.
    */