Remove command prefix

This removes generating a command prefix for the language client connecting to terraform-ls. This also removes registering prefixed commands to terraform-ls.

Author: jpogran

src/clientHandler.ts

@@ -17,7 +17,6 @@ import { config } from './vscodeUtils';
 import { CustomSemanticTokens } from './semanticTokens';
 
 export interface TerraformLanguageClient {
-  commandPrefix: string;
   client: LanguageClient;
 }
 
@@ -65,9 +64,7 @@ export class ClientHandler {
   }
 
   private async createTerraformClient(): Promise<TerraformLanguageClient> {
-    const commandPrefix = this.shortUid.seq();
-
-    const initializationOptions = this.getInitializationOptions(commandPrefix);
+    const initializationOptions = this.getInitializationOptions();
 
     const serverOptions = await this.getServerOptions();
 
@@ -110,7 +107,7 @@ export class ClientHandler {
       }
     });
 
-    return { commandPrefix, client };
+    return { client };
   }
 
   private async getServerOptions(): Promise<ServerOptions> {
@@ -129,7 +126,7 @@ export class ClientHandler {
     return serverOptions;
   }
 
-  private getInitializationOptions(commandPrefix: string) {
+  private getInitializationOptions() {
     const rootModulePaths = config('terraform-ls').get<string[]>('rootModules', []);
     const terraformExecPath = config('terraform-ls').get<string>('terraformExecPath', '');
     const terraformExecTimeout = config('terraform-ls').get<string>('terraformExecTimeout', '');
@@ -147,7 +144,6 @@ export class ClientHandler {
 
     const experimentalFeatures = config('terraform-ls').get('experimentalFeatures');
     const initializationOptions = {
-      commandPrefix,
       experimentalFeatures,
       ignoreSingleFileWarning,
       ...(terraformExecPath.length > 0 && { terraformExecPath }),

src/extension.ts

@@ -101,7 +101,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       if (selected && client) {
         const moduleUri = selected[0];
         const requestParams: ExecuteCommandParams = {
-          command: `${client.commandPrefix}.terraform-ls.terraform.init`,
+          command: `terraform-ls.terraform.init`,
           arguments: [`uri=${moduleUri}`],
         };
         await execWorkspaceCommand(client.client, requestParams);
@@ -164,7 +164,7 @@ export async function updateTerraformStatusBar(documentUri: vscode.Uri): Promise
     return;
   }
 
-  const initSupported = clientHandler.clientSupportsCommand(`${client.commandPrefix}.terraform-ls.terraform.init`);
+  const initSupported = clientHandler.clientSupportsCommand(`terraform-ls.terraform.init`);
   if (!initSupported) {
     return;
   }
@@ -240,7 +240,7 @@ interface ModuleCallersResponse {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function modulesCallersCommand(languageClient: TerraformLanguageClient, moduleUri: string): Promise<any> {
   const requestParams: ExecuteCommandParams = {
-    command: `${languageClient.commandPrefix}.terraform-ls.module.callers`,
+    command: `terraform-ls.module.callers`,
     arguments: [`uri=${moduleUri}`],
   };
   return execWorkspaceCommand(languageClient.client, requestParams);
@@ -288,7 +288,7 @@ async function terraformCommand(command: string, languageServerExec = true): Pro
 
     if (languageServerExec && languageClient) {
       const requestParams: ExecuteCommandParams = {
-        command: `${languageClient.commandPrefix}.terraform-ls.terraform.${command}`,
+        command: `terraform-ls.terraform.${command}`,
         arguments: [`uri=${selectedModule}`],
       };
       return execWorkspaceCommand(languageClient.client, requestParams);

src/providers/moduleCalls.ts

@@ -79,6 +79,7 @@ export class ModuleCallsDataProvider implements vscode.TreeDataProvider<ModuleCa
 
   constructor(ctx: vscode.ExtensionContext, public handler: ClientHandler) {
     this.svg = ctx.asAbsolutePath(path.join('assets', 'icons', 'terraform.svg'));
+
     ctx.subscriptions.push(
       vscode.commands.registerCommand('terraform.modules.refreshList', () => this.refresh()),
       vscode.commands.registerCommand('terraform.modules.openDocumentation', (module: ModuleCallItem) => {
@@ -136,15 +137,13 @@ export class ModuleCallsDataProvider implements vscode.TreeDataProvider<ModuleCa
     }
 
     return await handler.client.onReady().then(async () => {
-      const moduleCallsSupported = this.handler.clientSupportsCommand(
-        `${handler.commandPrefix}.terraform-ls.module.calls`,
-      );
+      const moduleCallsSupported = this.handler.clientSupportsCommand(`terraform-ls.module.calls`);
       if (!moduleCallsSupported) {
         return Promise.resolve([]);
       }
 
       const params: ExecuteCommandParams = {
-        command: `${handler.commandPrefix}.terraform-ls.module.calls`,
+        command: `terraform-ls.module.calls`,
         arguments: [`uri=${documentURI}`],
       };
 

src/providers/moduleProviders.ts

@@ -102,15 +102,13 @@ export class ModuleProvidersDataProvider implements vscode.TreeDataProvider<Modu
     }
     await handler.client.onReady();
 
-    const moduleCallsSupported = this.handler.clientSupportsCommand(
-      `${handler.commandPrefix}.terraform-ls.module.providers`,
-    );
+    const moduleCallsSupported = this.handler.clientSupportsCommand(`terraform-ls.module.providers`);
     if (!moduleCallsSupported) {
       return [];
     }
 
     const params: ExecuteCommandParams = {
-      command: `${handler.commandPrefix}.terraform-ls.module.providers`,
+      command: `terraform-ls.module.providers`,
       arguments: [`uri=${documentURI}`],
     };