Lazy load motion in attempt to fix #93

extension.ts

@@ -12,8 +12,6 @@ var modeHandler : ModeHandler;
 // this method is called when your extension is activated
 // your extension is activated the very first time the command is executed
 export function activate(context: vscode.ExtensionContext) {
-    modeHandler = new ModeHandler();
-
     console.log('Congratulations, your extension "vim" is now active!');
 
     registerCommand(context, 'extension.showCmdLine', () => showCmdLine());
@@ -97,6 +95,8 @@ export function activate(context: vscode.ExtensionContext) {
     registerCommand(context, 'extension.vim_>', () => handleKeyEvent(">"));
 
     registerCommand(context, 'extension.vim_backslash', () => handleKeyEvent("\\"));
+
+    context.subscriptions.push(modeHandler); 
 }
 
 function registerCommand(context: vscode.ExtensionContext, command: string, callback: (...args: any[]) => any) {
@@ -105,5 +105,6 @@ function registerCommand(context: vscode.ExtensionContext, command: string, call
 }
 
 function handleKeyEvent(key:string) {
+    modeHandler = modeHandler || new ModeHandler();
     modeHandler.handleKeyEvent(key);
 }

package.json

@@ -3,7 +3,7 @@
   "displayName": "Vim",
   "description": "Vim emulation for Visual Studio Code",
   "icon": "images/icon.png",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "publisher": "vscodevim",
   "galleryBanner": {
     "color": "#a5c9a2",
@@ -36,10 +36,7 @@
   "main": "./out/extension",
   "contributes": {
     "commands": [
-      {
-        "command": "extension.showCmdLine",
-        "title": "Vim: Show Command Line"
-      }
+        { "command": "extension.showCmdLine", "title": "Vim: Show Command Line" }
     ],
     "keybindings": [
         { "key": "Escape", "command": "extension.vim_esc", "when": "editorTextFocus" },

src/mode/modeHandler.ts

@@ -76,4 +76,8 @@ export default class ModeHandler {
         this.statusBarItem.text = (text) ? '-- ' + text + ' --' : '';
         this.statusBarItem.show();
     }
+
+    dispose() {
+        this.statusBarItem.dispose();
+    }
 }

src/mode/modeInsert.ts

@@ -4,7 +4,12 @@ import TextEditor from './../textEditor';
 import {Cursor} from './../motion/motion';
 
 export default class InsertMode extends Mode {
-    private cursor : Cursor;
+	private _cursor : Cursor;
+	private get cursor() : Cursor {
+		this._cursor = this._cursor || new Cursor();
+		return this._cursor;
+	}
+
     private activationKeyHandler : { [ key : string] : (cursor : Cursor) => Thenable<{}> } = {
         "i" : () => {
             // insert at cursor
@@ -34,7 +39,6 @@ export default class InsertMode extends Mode {
 
     constructor() {
         super(ModeName.Insert);
-        this.cursor = new Cursor();
     }
 
     ShouldBeActivated(key : string, currentMode : ModeName) : boolean {

src/mode/modeNormal.ts

@@ -5,7 +5,12 @@ import {showCmdLine} from './../cmd_line/main';
 import {Caret} from './../motion/motion';
 
 export default class NormalMode extends Mode {
-	private caret : Caret;
+	private _caret : Caret;
+	private get caret() : Caret {
+		this._caret = this._caret || new Caret();
+		return this._caret;
+	}
+
 	private keyHandler : { [key : string] : (caret : Caret) => Thenable<{}>; } = {
 		":" : () => { return showCmdLine(); },
 		"u" : () => { return vscode.commands.executeCommand("undo"); },
@@ -31,7 +36,6 @@ export default class NormalMode extends Mode {
 
 	constructor() {
 		super(ModeName.Normal);
-		this.caret = new Caret();
 	}
 
 	ShouldBeActivated(key : string, currentMode : ModeName) : boolean {