diff --git a/src/extension.ts b/src/extension.ts index f1cbf8049..6f1adfa53 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -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'; @@ -51,11 +51,6 @@ export async function activate(context: vscode.ExtensionContext): Promise 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 diff --git a/src/settings.ts b/src/settings.ts index 42d90f842..853e95a02 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -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; -}