temp

Author: benfdking

sqlmesh/lsp/main.py

@@ -23,6 +23,10 @@
     ApiResponseGetLineage,
     ApiResponseGetModels,
 )
+
+# Define the command constant
+EXTERNAL_MODEL_UPDATE_COLUMNS = "sqlmesh.external_model_update_columns"
+
 from sqlmesh.lsp.completions import get_sql_completions
 from sqlmesh.lsp.context import (
     LSPContext,

vscode/extension/src/extension.ts

@@ -131,8 +131,7 @@ export async function activate(context: vscode.ExtensionContext) {
           'LSP restart failed',
         )
       }
-      context.subscriptions.push(lspClient)
-      context.subscriptions.push(setupTestController(lspClient))
+      // Don't push to subscriptions again during restart - it's already there
     } else {
       lspClient = new LSPClient()
       const result = await lspClient.start(invokedByUser)

vscode/extension/src/lsp/lsp.ts

@@ -135,7 +135,24 @@ export class LSPClient implements Disposable {
       serverOptions,
       clientOptions,
     )
-    await this.client.start()
+    try {
+      await this.client.start()
+    } catch (error: any) {
+      // Ignore the specific error about command already being registered
+      if (
+        error?.message?.includes(
+          "command 'sqlmesh.external_model_update_columns' already exists",
+        )
+      ) {
+        traceInfo(
+          'Ignoring duplicate command registration error during restart',
+        )
+        // Continue normally - the client is still functional
+      } else {
+        // Re-throw other errors
+        throw error
+      }
+    }
     return ok(undefined)
   }
 
@@ -149,6 +166,7 @@ export class LSPClient implements Disposable {
   public async stop(stoppedByUser = false): Promise<void> {
     if (this.client) {
       await this.client.stop()
+      await this.client.dispose()
       this.client = undefined
       // Reset supported methods state when the client stops
       this.supportedMethodsState = { type: 'not-fetched' }