From 157d07c5ee7f10a863fe30f070850b9213b5412c Mon Sep 17 00:00:00 2001 From: James Pogran Date: Mon, 19 Sep 2022 08:31:24 -0400 Subject: [PATCH] Fix enable terraform-ls after disbaling This commit ensures all commands that control terraform-ls are registered regardles of whether or not terraform-ls is enabled. This allows the when clauses to work appropriately but still have the commands registered. --- src/extension.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 35dd3bef5..b5dca1fe8 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -46,6 +46,9 @@ export async function activate(context: vscode.ExtensionContext): Promise await migrateLegacySettings(context); + // always register commands needed to control terraform-ls + context.subscriptions.push(new TerraformLSCommands()); + if (config('terraform').get('languageServer.enable') === false) { reporter.sendTelemetryEvent('disabledTerraformLS'); return; @@ -94,11 +97,7 @@ export async function activate(context: vscode.ExtensionContext): Promise ]); // these need the LS to function, so are only registered if enabled - context.subscriptions.push( - new GenerateBugReportCommand(context), - new TerraformLSCommands(), - new TerraformCommands(client, reporter), - ); + context.subscriptions.push(new GenerateBugReportCommand(context), new TerraformCommands(client, reporter)); await startLanguageServer(context); }