EasyMotion object is now recreated when reset

VSCodeVim · Nov 1, 2016 · d261014 · d261014
1 parent d911ec0
commit d261014
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 34 deletions.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -856,7 +856,8 @@ class CommandEsc extends BaseCommand {
 
     if (vimState.currentMode === ModeName.EasyMotionMode) {
       // Escape or other termination keys were pressed, exit mode
-      vimState.easyMotion.exitMode();
+      vimState.easyMotion.clearDecorations();
+      vimState.currentMode = ModeName.Normal;
     }
 
     vimState.currentMode = ModeName.Normal;
@@ -5337,10 +5338,11 @@ abstract class BaseEasyMotionCommand extends BaseCommand {
       return vimState;
     }
 
-    this.processMarkers(matches, position, vimState);
-
     // Enter the EasyMotion mode and await further keys
-    vimState.easyMotion.enterMode();
+    vimState.currentMode = ModeName.EasyMotionMode;
+    vimState.easyMotion = new EasyMotion();
+
+    this.processMarkers(matches, position, vimState);
 
     return vimState;
   }
@@ -5535,12 +5537,15 @@ class MoveEasyMotion extends BaseMovement {
     if (markers.length === 1) { // Only one found, navigate to it
       var marker = markers[0];
 
-      vimState.easyMotion.exitMode();
+      vimState.easyMotion.clearDecorations();
+      vimState.currentMode = ModeName.Normal;
 
       return marker.position;
     } else {
       if (markers.length === 0) { // None found, exit mode
-        vimState.easyMotion.exitMode();
+        vimState.easyMotion.clearDecorations();
+        vimState.currentMode = ModeName.Normal;
+
         return position;
       }
     }

diff --git a/src/easymotion/easymotion.ts b/src/easymotion/easymotion.ts
@@ -1,13 +1,9 @@
 import * as vscode from "vscode";
 
 import { Position } from './../motion/position';
-import { VimState } from './../mode/modeHandler';
-import { ModeName } from './../mode/mode';
 import { TextEditor } from './../textEditor';
 
 export class EasyMotion {
-  private _vimState: VimState;
-
   /**
    * Refers to the accumulated keys for depth navigation
    */
@@ -18,7 +14,7 @@ export class EasyMotion {
    */
   private markers: EasyMotion.Marker[];
   private visibleMarkers: EasyMotion.Marker[]; // Array of currently showing markers
-  private decorations: any[][] = [];
+  private decorations: any[][];
 
   /**
    * TODO: For future motions
@@ -40,10 +36,10 @@ export class EasyMotion {
     "v", "b", "n", "m", "f", "j"
   ];
 
-  constructor(vimState: VimState) {
-    this._vimState = vimState;
-
+  constructor() {
+    this.markers = [];
     this.visibleMarkers = [];
+    this.decorations = [];
   }
 
   /**
@@ -143,25 +139,6 @@ export class EasyMotion {
       return uri;
   }
 
-  /**
-   * Enter EasyMotion mode
-   */
-  public enterMode() {
-    this.accumulation = "";
-    this._vimState.currentMode = ModeName.EasyMotionMode;
-  }
-
-  /**
-   * Exit EasyMotion mode and clean up
-   */
-  public exitMode() {
-    this._vimState.currentMode = ModeName.Normal;
-
-    this.accumulation = "";
-    this.clearMarkers();
-    this.clearDecorations();
-  }
-
   /**
    * Clear all decorations
    */

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -452,7 +452,7 @@ export class ModeHandler implements vscode.Disposable {
       new EasyMotionMode(),
     ];
     this.vimState.historyTracker = new HistoryTracker();
-    this.vimState.easyMotion = new EasyMotion(this.vimState);
+    this.vimState.easyMotion = new EasyMotion();
 
     this._vimState.currentMode = ModeName.Normal;