Fix terraform status bar (#857)

* add missing command prefix for callers

* add test for status bar

* call updateTerraformStatusBar to avoid sleep

Author: dbanck

src/extension.ts

@@ -14,7 +14,7 @@ import { config, getActiveTextEditor } from './vscodeUtils';
 
 const brand = `HashiCorp Terraform`;
 const outputChannel = vscode.window.createOutputChannel(brand);
-const terraformStatus = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 0);
+export let terraformStatus: vscode.StatusBarItem;
 
 let reporter: TelemetryReporter;
 let clientHandler: ClientHandler;
@@ -27,6 +27,7 @@ export interface TerraformExtension {
 
 export async function activate(context: vscode.ExtensionContext): Promise<TerraformExtension> {
   const manifest = context.extension.packageJSON;
+  terraformStatus = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 0);
   reporter = new TelemetryReporter(context.extension.id, manifest.version, manifest.appInsightsKey);
   context.subscriptions.push(reporter);
 
@@ -157,8 +158,9 @@ export async function deactivate(): Promise<void> {
   return clientHandler.stopClient();
 }
 
-async function updateTerraformStatusBar(documentUri: vscode.Uri): Promise<void> {
-  const initSupported = clientHandler.clientSupportsCommand('terraform-ls.terraform.init');
+export async function updateTerraformStatusBar(documentUri: vscode.Uri): Promise<void> {
+  const client = clientHandler.getClient();
+  const initSupported = clientHandler.clientSupportsCommand(`${client.commandPrefix}.terraform-ls.terraform.init`);
   if (initSupported) {
     const client = clientHandler.getClient();
     const moduleUri = Utils.dirname(documentUri);
@@ -175,6 +177,7 @@ async function updateTerraformStatusBar(documentUri: vscode.Uri): Promise<void>
           terraformStatus.show();
         } else {
           terraformStatus.hide();
+          terraformStatus.text = '';
         }
       } catch (err) {
         vscode.window.showErrorMessage(err);

src/test/integration/statusBar.test.ts

@@ -0,0 +1,29 @@
+import * as assert from 'assert';
+import * as vscode from 'vscode';
+import { expect } from 'chai';
+import { terraformStatus, updateTerraformStatusBar } from '../../extension';
+import { getDocUri } from '../helper';
+
+suite('statusBar', () => {
+  teardown(async () => {
+    await vscode.commands.executeCommand('workbench.action.closeAllEditors');
+  });
+
+  test('should create a status bar item on activate', () => {
+    assert.notStrictEqual(terraformStatus, undefined);
+  });
+
+  test('should create a status bar with the root module label', async () => {
+    const documentUri = getDocUri('sample.tf');
+    await updateTerraformStatusBar(documentUri);
+
+    expect(terraformStatus.text).to.equal('$(refresh) testFixture');
+  });
+
+  test('should create an empty status bar inside a child module', async () => {
+    const documentUri = getDocUri('modules/sample.tf');
+    await updateTerraformStatusBar(documentUri);
+
+    expect(terraformStatus.text).to.equal('');
+  });
+});