Skip to content

Commit

Permalink
Remove check if both extensions are installed
Browse files Browse the repository at this point in the history
The new pre-releases extensions function only allows one
extension to be installed at a time.
  • Loading branch information
dbanck committed May 3, 2023
1 parent 0acffc6 commit 2b913a2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
7 changes: 1 addition & 6 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { ShowReferencesFeature } from './features/showReferences';
import { CustomSemanticTokens } from './features/semanticTokens';
import { ModuleProvidersFeature } from './features/moduleProviders';
import { ModuleCallsFeature } from './features/moduleCalls';
import { getInitializationOptions, migrateLegacySettings, previewExtensionPresent } from './settings';
import { getInitializationOptions, migrateLegacySettings } from './settings';
import { TerraformLSCommands } from './commands/terraformls';
import { TerraformCommands } from './commands/terraform';
import { TerraformVersionFeature } from './features/terraformVersion';
Expand All @@ -51,11 +51,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
reporter = new TelemetryReporter(context.extension.id, manifest.version, manifest.appInsightsKey);
context.subscriptions.push(reporter);

if (previewExtensionPresent(context.extension.id)) {
reporter.sendTelemetryEvent('previewExtensionPresentWithStable');
return undefined;
}

await migrateLegacySettings(context);

// always register commands needed to control terraform-ls
Expand Down
21 changes: 0 additions & 21 deletions src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,24 +157,3 @@ export async function migrateLegacySettings(ctx: vscode.ExtensionContext) {
await deleteSetting('terraform-ls', 'experimentalFeatures');
await vscode.commands.executeCommand('workbench.action.reloadWindow');
}

export function previewExtensionPresent(currentExtensionID: string) {
const stable = vscode.extensions.getExtension('hashicorp.terraform');
const preview = vscode.extensions.getExtension('hashicorp.terraform-preview');

const msg = 'Please ensure only one is enabled or installed and reload this window';

if (currentExtensionID === 'hashicorp.terraform-preview') {
if (stable !== undefined) {
vscode.window.showErrorMessage('Terraform Preview cannot be used while Terraform Stable is also enabled.' + msg);
return true;
}
} else if (currentExtensionID === 'hashicorp.terraform') {
if (preview !== undefined) {
vscode.window.showErrorMessage('Terraform Stable cannot be used while Terraform Preview is also enabled.' + msg);
return true;
}
}

return false;
}

0 comments on commit 2b913a2

Please sign in to comment.