test

Author: benfdking

sqlmesh/lsp/main.py

@@ -368,43 +368,45 @@ def function_call(ls: LanguageServer, params: t.Any) -> t.Dict[str, t.Any]:
 
             self.server.feature(name)(create_function_call(method))
 
-        @self.server.command(EXTERNAL_MODEL_UPDATE_COLUMNS)
-        def command_external_models_update_columns(ls: LanguageServer, raw: t.Any) -> None:
-            try:
-                if not isinstance(raw, list):
-                    raise ValueError("Invalid command parameters")
-                if len(raw) != 1:
-                    raise ValueError("Command expects exactly one parameter")
-                model_name = raw[0]
-                if not isinstance(model_name, str):
-                    raise ValueError("Command parameter must be a string")
-
-                context = self._context_get_or_load()
-                if not isinstance(context, LSPContext):
-                    raise ValueError("Context is not loaded or invalid")
-                model = context.context.get_model(model_name)
-                if model is None:
-                    raise ValueError(f"External model '{model_name}' not found")
-                if model._path is None:
-                    raise ValueError(f"External model '{model_name}' does not have a file path")
-                uri = URI.from_path(model._path)
-                updated = context.update_external_model_columns(
-                    ls=ls,
-                    uri=uri,
-                    model_name=model_name,
-                )
-                if updated:
-                    ls.show_message(
-                        f"Updated columns for '{model_name}'",
-                        types.MessageType.Info,
-                    )
-                else:
-                    ls.show_message(
-                        f"Columns for '{model_name}' are already up to date",
+        # Check if command is already registered to prevent duplicate registration errors
+        if EXTERNAL_MODEL_UPDATE_COLUMNS not in getattr(self.server, '_commands', {}):
+            @self.server.command(EXTERNAL_MODEL_UPDATE_COLUMNS)
+            def command_external_models_update_columns(ls: LanguageServer, raw: t.Any) -> None:
+                try:
+                    if not isinstance(raw, list):
+                        raise ValueError("Invalid command parameters")
+                    if len(raw) != 1:
+                        raise ValueError("Command expects exactly one parameter")
+                    model_name = raw[0]
+                    if not isinstance(model_name, str):
+                        raise ValueError("Command parameter must be a string")
+
+                    context = self._context_get_or_load()
+                    if not isinstance(context, LSPContext):
+                        raise ValueError("Context is not loaded or invalid")
+                    model = context.context.get_model(model_name)
+                    if model is None:
+                        raise ValueError(f"External model '{model_name}' not found")
+                    if model._path is None:
+                        raise ValueError(f"External model '{model_name}' does not have a file path")
+                    uri = URI.from_path(model._path)
+                    updated = context.update_external_model_columns(
+                        ls=ls,
+                        uri=uri,
+                        model_name=model_name,
                     )
-            except Exception as e:
-                ls.show_message(f"Error executing command: {e}", types.MessageType.Error)
-                return None
+                    if updated:
+                        ls.show_message(
+                            f"Updated columns for '{model_name}'",
+                            types.MessageType.Info,
+                        )
+                    else:
+                        ls.show_message(
+                            f"Columns for '{model_name}' are already up to date",
+                        )
+                except Exception as e:
+                    ls.show_message(f"Error executing command: {e}", types.MessageType.Error)
+                    return None
 
         @self.server.feature(types.INITIALIZE)
         def initialize(ls: LanguageServer, params: types.InitializeParams) -> None:

vscode/extension/src/lsp/lsp.ts

@@ -148,10 +148,12 @@ export class LSPClient implements Disposable {
 
   public async stop(stoppedByUser = false): Promise<void> {
     if (this.client) {
+      traceInfo('Stopping SQLMesh Language Server')
       await this.client.stop()
       this.client = undefined
       // Reset supported methods state when the client stops
       this.supportedMethodsState = { type: 'not-fetched' }
+      traceInfo('SQLMesh Language Server stopped')
     }
     if (stoppedByUser) {
       this.explicitlyStopped = true