Initialize mode and cursor after startup

VSCodeVim · Jul 17, 2016 · fd85fc5 · fd85fc5
1 parent f152ee1
commit fd85fc5
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/extension.ts b/extension.ts
@@ -55,7 +55,7 @@ export async function getAndUpdateModeHandler(): Promise<ModeHandler> {
   return handler;
 }
 
-export function activate(context: vscode.ExtensionContext) {
+export async function activate(context: vscode.ExtensionContext) {
   extensionContext = context;
 
   registerCommand(context, 'type', async (args) => {
@@ -68,7 +68,7 @@ export function activate(context: vscode.ExtensionContext) {
         const mh = await getAndUpdateModeHandler();
         await mh.handleKeyEvent(args.text);
       },
-      isRunning : false
+      isRunning: false
     });
   });
 
@@ -87,9 +87,9 @@ export function activate(context: vscode.ExtensionContext) {
         mh.vimState.cursorPosition = Position.FromVSCodePosition(vscode.window.activeTextEditor.selection.start);
         mh.vimState.cursorStartPosition = Position.FromVSCodePosition(vscode.window.activeTextEditor.selection.start);
       },
-      isRunning : false
+      isRunning: false
     });
-   });
+  });
 
   registerCommand(context, 'extension.vim_esc', () => handleKeyEvent("<esc>"));
   registerCommand(context, 'extension.vim_backspace', () => handleKeyEvent("<backspace>"));
@@ -105,6 +105,12 @@ export function activate(context: vscode.ExtensionContext) {
   ['left', 'right', 'up', 'down'].forEach(key => {
     registerCommand(context, `extension.vim_${key}`, () => handleKeyEvent(`<${key}>`));
   });
+
+  // Initialize mode handler for current active Text Editor at startup.
+  if (vscode.window.activeTextEditor) {
+    let mh = await getAndUpdateModeHandler()
+    mh.updateView(mh.vimState, false);
+  }
 }
 
 function registerCommand(context: vscode.ExtensionContext, command: string, callback: (...args: any[]) => any) {