does this work

Author: jpogran

src/clientHandler.ts

@@ -59,6 +59,10 @@ export class ClientHandler {
   }
 
   public async stopClients(): Promise<void> {
+    if (this.tfClient === undefined || this.tfClient.client === undefined) {
+      return;
+    }
+
     return this.tfClient.client
       .stop()
       .then(() => {
@@ -144,7 +148,8 @@ export class ClientHandler {
     return this.tfClient;
   }
 
-  public clientSupportsCommand(cmdName: string): boolean {
+  public async clientSupportsCommand(cmdName: string): Promise<boolean> {
+    await this.tfClient.client.onReady();
     return this.supportedCommands.includes(cmdName);
   }
 }

src/extension.ts

@@ -125,23 +125,49 @@ export async function activate(context: vscode.ExtensionContext): Promise<Terraf
         await clientHandler.startClients();
       }
     }),
-    vscode.window.onDidChangeVisibleTextEditors(async () => {
-      const textEditor = getActiveTextEditor();
-      if (textEditor === undefined) {
-        return;
-      }
-      if (textEditor.document === undefined) {
-        return;
-      }
-      await updateTerraformStatusBar(textEditor.document.uri);
-    }),
+    // 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)),
   );
 
-  if (enabled()) {
+  // if (enabled()) {
+  //   try {
+  //     vscode.commands.executeCommand('setContext', 'terraform.showModuleView', true);
+  //     const ds = await updateLanguageServer(manifest.version, clientHandler, lsPath);
+  //     context.subscriptions.push(...ds);
+  //   } catch (error) {
+  //     reporter.sendTelemetryException(error);
+  //   }
+  // }
+
+  if (config('terraform').get<boolean>('languageServer.external')) {
     try {
+      vscode.commands.executeCommand('setContext', 'terraform.showModuleView', true);
       await updateLanguageServer(manifest.version, clientHandler, lsPath);
       vscode.commands.executeCommand('setContext', 'terraform.showModuleView', true);
+
+      (await clientHandler.getClient()).client.onReady().then(() => {
+        context.subscriptions.push(
+          vscode.window.onDidChangeVisibleTextEditors(async () => {
+            // can't register this until client is ready, otherwise we can't
+            // know if command is supported
+            const textEditor = getActiveTextEditor();
+            if (textEditor === undefined) {
+              return;
+            }
+
+            await updateTerraformStatusBar(textEditor.document.uri);
+          }),
+        );
+      });
     } catch (error) {
       reporter.sendTelemetryException(error);
     }

src/test/integration/workspaces.test.ts

@@ -20,10 +20,17 @@ suite('moduleCallers', () => {
 
     assert.ok(ext.isActive);
 
-		const client = await ext.exports.handler.getClient();
+		const api = ext.exports;
+    assert.ok(api.handler);
+    assert.ok(api.moduleCallers);
+
+		const client = await api.handler.getClient();
+    assert.ok(client);
 
 		const moduleUri = Utils.dirname(documentUri).toString();
-		const response = await ext.exports.moduleCallers(client, moduleUri);
+		const response = await api.moduleCallers(client, moduleUri);
+    assert.ok(response);
+
 		assert.strictEqual(response.moduleCallers.length, 1);
 		assert.strictEqual(response.moduleCallers[0].uri, vscode.Uri.file(testFolderPath).toString(true));
 	})