strongly type extension activation

Author: jpogran

src/extension.ts

@@ -17,7 +17,12 @@ let reporter: TelemetryReporter;
 let clientHandler: ClientHandler;
 const languageServerUpdater = new SingleInstanceTimeout();
 
-export async function activate(context: vscode.ExtensionContext): Promise<any> {
+export interface TerraformExtension {
+  handler: ClientHandler;
+  moduleCallers;
+}
+
+export async function activate(context: vscode.ExtensionContext): Promise<TerraformExtension> {
   const manifest = context.extension.packageJSON;
   reporter = new TelemetryReporter(context.extension.id, manifest.version, manifest.appInsightsKey);
   context.subscriptions.push(reporter);
@@ -122,6 +127,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
     }),
     vscode.window.onDidChangeVisibleTextEditors(async () => {
       const textEditor = getActiveTextEditor();
+      if (textEditor === undefined) {
+        return;
+      }
+      if (textEditor.document === undefined) {
+        return;
+      }
       await updateTerraformStatusBar(textEditor.document.uri);
     }),
     vscode.window.registerTreeDataProvider('terraform.modules', new ModuleProvider(context, clientHandler)),
@@ -137,7 +148,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
   }
 
   // export public API
-  return { clientHandler, moduleCallers };
+  return { handler: clientHandler, moduleCallers };
 }
 
 export function deactivate(): Promise<void> {

src/test/integration/workspaces.test.ts

@@ -1,6 +1,7 @@
 import * as assert from 'assert';
 import * as vscode from 'vscode';
 import { Utils } from 'vscode-uri';
+import { TerraformExtension } from '../../extension';
 import { getDocUri, getExtensionId, open, testFolderPath } from '../helper';
 
 
@@ -12,14 +13,14 @@ suite('moduleCallers', () => {
 
 	test('should execute language server command', async () => {
 		const extId = getExtensionId()
-		const ext = vscode.extensions.getExtension(extId);
+		const ext = vscode.extensions.getExtension<TerraformExtension>(extId);
 
 		const documentUri = getDocUri('modules/sample.tf');
 		await open(documentUri);
 
     assert.ok(ext.isActive);
 
-		const client = ext.exports.clientHandler.getClient(documentUri);
+		const client = ext.exports.handler.getClient();
 
 		const moduleUri = Utils.dirname(documentUri).toString();
 		const response = await ext.exports.moduleCallers(client, moduleUri);