make commands unique for language server instances

Author: d-biehl

robotcode/language_server/common/parts/commands.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import uuid
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict, List, Optional
 
 from ....jsonrpc2.protocol import JsonRPCErrorException, rpc_method
@@ -23,22 +25,38 @@
 _FUNC_TYPE = Callable[..., Awaitable[Optional[LSPAny]]]
 
 
+@dataclass
+class CommandEntry:
+    name: str
+    callback: _FUNC_TYPE
+
+
 class CommandsProtocolPart(LanguageServerProtocolPart, HasExtendCapabilities):
 
     _logger = LoggingDescriptor()
 
+    PREFIX = f"{uuid.uuid4()}"
+
     def __init__(self, parent: LanguageServerProtocol) -> None:
         super().__init__(parent)
-        self.commands: Dict[str, _FUNC_TYPE] = {}
+        self.commands: Dict[str, CommandEntry] = {}
 
-    def register(self, callback: _FUNC_TYPE, name: Optional[str] = None) -> None:
-        command = name or get_command_name(callback)
+    def register(self, callback: _FUNC_TYPE, name: Optional[str] = None) -> CommandEntry:
+        name = name or get_command_name(callback)
+
+        command = f"{self.PREFIX}.{name}"
 
         if command in self.commands:
             self._logger.critical(f"command '{command}' already registered.")
-            return
+        else:
+            self.commands[command] = CommandEntry(name, callback)
+
+        return self.commands[command]
+
+    def get_command_name(self, callback: _FUNC_TYPE, name: Optional[str] = None) -> str:
+        name = name or get_command_name(callback)
 
-        self.commands[command] = callback
+        return f"{self.PREFIX}.{name}"
 
     def extend_capabilities(self, capabilities: ServerCapabilities) -> None:
 
@@ -51,8 +69,8 @@ async def _workspace_execute_command(
     ) -> Optional[LSPAny]:
         self._logger.info(f"execute command {command}")
 
-        callback = self.commands.get(command, None)
-        if callback is None:
+        entry = self.commands.get(command, None)
+        if entry is None or entry.callback is None:
             raise JsonRPCErrorException(ErrorCodes.INVALID_PARAMS, f"Command '{command}' unknown.")
 
-        return await callback(*(arguments or ()))
+        return await entry.callback(*(arguments or ()))

robotcode/language_server/robotframework/parts/code_action.py

@@ -17,12 +17,7 @@
 from ....utils.logging import LoggingDescriptor
 from ....utils.net import find_free_port
 from ....utils.uri import Uri
-from ...common.decorators import (
-    code_action_kinds,
-    command,
-    get_command_name,
-    language_id,
-)
+from ...common.decorators import code_action_kinds, command, language_id
 from ...common.lsp_types import (
     AnnotatedTextEdit,
     ChangeAnnotation,
@@ -292,7 +287,7 @@ async def collect(
                                     kind=CodeActionKinds.SOURCE + ".openDocumentation",
                                     command=Command(
                                         f"Translate Suite to {lang}",
-                                        get_command_name(self.translate_suite),
+                                        self.parent.commands.get_command_name(self.translate_suite),
                                         [document.document_uri, lang],
                                     ),
                                 )
@@ -336,10 +331,7 @@ async def collect(
                     CodeAction(
                         "Create Keyword",
                         kind=CodeActionKinds.QUICKFIX + ".createKeyword",
-                        command=Command(
-                            "Create Keyword",
-                            "robotcode.commingSoon",
-                        ),
+                        command=Command("Create Keyword", self.parent.commands.get_command_name(self.comming_soon)),
                     )
                 ]