fix: The debugger no longer requires a dependency on the language server

Author: d-biehl

packages/core/robotcode/core/version.py

@@ -0,0 +1,48 @@
+import re
+from typing import NamedTuple, Optional
+
+
+class InvalidVersionError(Exception):
+    def __init__(self) -> None:
+        super().__init__("Invalid version string.")
+
+
+class Version(NamedTuple):
+    major: int
+    minor: int
+    patch: Optional[int] = None
+    pre_id: Optional[str] = None
+    pre_number: Optional[int] = None
+    dev: Optional[int] = None
+
+
+def create_version_from_str(version_str: str) -> Version:
+    def s_to_i(s: Optional[str]) -> Optional[int]:
+        return int(s) if s is not None else None
+
+    try:
+        m = re.match(
+            r"(?P<major>\d+)"
+            r"(\.(?P<minor>\d+))"
+            r"(\.(?P<patch>\d+))?"
+            r"((?P<pre_id>a|b|rc)(?P<pre_number>\d+))?"
+            r"(\.(dev(?P<dev>\d+)))?"
+            r"(?P<rest>.+)?",
+            version_str,
+        )
+
+        if m is not None and m.group("rest") is None:
+            return Version(
+                int(m.group("major")),
+                int(m.group("minor")),
+                s_to_i(m.group("patch")) or 0,
+                m.group("pre_id"),
+                s_to_i(m.group("pre_number")),
+                s_to_i(m.group("dev")),
+            )
+    except (SystemExit, KeyboardInterrupt):
+        raise
+    except BaseException as ex:
+        raise InvalidVersionError from ex
+
+    raise InvalidVersionError

packages/debugger/robotcode/debugger/launcher/server.py

@@ -6,6 +6,7 @@
 from typing import Any, Dict, List, Literal, Optional
 
 from robotcode.core.logging import LoggingDescriptor
+from robotcode.core.version import Version, create_version_from_str
 from robotcode.debugger.client import DAPClient, DAPClientError
 from robotcode.debugger.dap_types import (
     AttachRequest,
@@ -35,7 +36,17 @@
 from robotcode.debugger.protocol import DebugAdapterProtocol
 from robotcode.jsonrpc2.protocol import rpc_method
 from robotcode.jsonrpc2.server import JsonRPCServer, JsonRpcServerMode, TcpParams
-from robotcode.language_server.robotframework.utils.version import get_robot_version
+
+_robot_version: Optional[Version] = None
+
+
+def get_robot_version() -> Version:
+    global _robot_version
+    if _robot_version is None:
+        import robot.version
+
+        _robot_version = create_version_from_str(robot.version.get_version())
+    return _robot_version
 
 
 class OutputProtocol(asyncio.SubprocessProtocol):
@@ -296,7 +307,10 @@ async def _launch(
 
     @rpc_method(name="configurationDone", param_type=ConfigurationDoneArguments)
     async def _configuration_done(
-        self, arguments: Optional[ConfigurationDoneArguments] = None, *args: Any, **kwargs: Any
+        self,
+        arguments: Optional[ConfigurationDoneArguments] = None,
+        *args: Any,
+        **kwargs: Any,
     ) -> None:
         await self.client.protocol.send_request_async(ConfigurationDoneRequest(arguments=arguments))
         await self.client.protocol.send_request_async(AttachRequest(arguments=AttachRequestArguments()))

packages/language_server/robotcode/language_server/robotframework/parts/formatting.py

@@ -15,8 +15,8 @@
 if TYPE_CHECKING:
     from robotcode.language_server.robotframework.protocol import RobotLanguageServerProtocol
 
+from robotcode.core.version import create_version_from_str
 from robotcode.language_server.robotframework.configuration import RoboTidyConfig
-from robotcode.language_server.robotframework.utils.version import create_version_from_str
 
 from .model_helper import ModelHelperMixin
 from .protocol_part import RobotLanguageServerProtocolPart

packages/language_server/robotcode/language_server/robotframework/parts/robocop_diagnostics.py

@@ -5,6 +5,7 @@
 
 from robotcode.core.async_tools import check_canceled, threaded
 from robotcode.core.logging import LoggingDescriptor
+from robotcode.core.version import create_version_from_str
 from robotcode.language_server.common.decorators import language_id
 from robotcode.language_server.common.lsp_types import (
     Diagnostic,
@@ -16,9 +17,6 @@
 from robotcode.language_server.common.parts.workspace import WorkspaceFolder
 from robotcode.language_server.common.text_document import TextDocument
 from robotcode.language_server.robotframework.configuration import RoboCopConfig
-from robotcode.language_server.robotframework.utils.version import (
-    create_version_from_str,
-)
 
 from .protocol_part import RobotLanguageServerProtocolPart
 

packages/language_server/robotcode/language_server/robotframework/utils/version.py

@@ -1,22 +1,6 @@
-import re
-from typing import NamedTuple, Optional
-
-__all__ = ["InvalidVersionError", "get_robot_version"]
-
-
-class InvalidVersionError(Exception):
-    def __init__(self) -> None:
-        super().__init__("Invalid robot version string.")
-
-
-class Version(NamedTuple):
-    major: int
-    minor: int
-    patch: Optional[int] = None
-    pre_id: Optional[str] = None
-    pre_number: Optional[int] = None
-    dev: Optional[int] = None
+from typing import Optional
 
+from robotcode.core.version import Version, create_version_from_str
 
 _robot_version: Optional[Version] = None
 
@@ -34,35 +18,3 @@ def get_robot_version_str() -> str:
     import robot.version
 
     return str(robot.version.get_version())
-
-
-def create_version_from_str(version_str: str) -> Version:
-    def s_to_i(s: Optional[str]) -> Optional[int]:
-        return int(s) if s is not None else None
-
-    try:
-        m = re.match(
-            r"(?P<major>\d+)"
-            r"(\.(?P<minor>\d+))"
-            r"(\.(?P<patch>\d+))?"
-            r"((?P<pre_id>a|b|rc)(?P<pre_number>\d+))?"
-            r"(\.(dev(?P<dev>\d+)))?"
-            r"(?P<rest>.+)?",
-            version_str,
-        )
-
-        if m is not None and m.group("rest") is None:
-            return Version(
-                int(m.group("major")),
-                int(m.group("minor")),
-                s_to_i(m.group("patch")) or 0,
-                m.group("pre_id"),
-                s_to_i(m.group("pre_number")),
-                s_to_i(m.group("dev")),
-            )
-    except (SystemExit, KeyboardInterrupt):
-        raise
-    except BaseException as ex:
-        raise InvalidVersionError from ex
-
-    raise InvalidVersionError