robotcode-debugger 0.78.4__tar.gz → 0.79.0__tar.gz

{robotcode_debugger-0.78.4 → robotcode_debugger-0.79.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-debugger
-Version: 0.78.4
+Version: 0.79.0
 Summary: RobotCode Debugger for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://github.com/sponsors/d-biehl
@@ -25,8 +25,8 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-jsonrpc2==0.78.4
-Requires-Dist: robotcode-runner==0.78.4
+Requires-Dist: robotcode-jsonrpc2==0.79.0
+Requires-Dist: robotcode-runner==0.79.0
 Requires-Dist: robotframework>=4.1.0
 Provides-Extra: debugpy
 Requires-Dist: debugpy; extra == 'debugpy'

{robotcode_debugger-0.78.4 → robotcode_debugger-0.79.0}/pyproject.toml

@@ -28,8 +28,8 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-jsonrpc2==0.78.4",
-  "robotcode-runner==0.78.4",
+  "robotcode-jsonrpc2==0.79.0",
+  "robotcode-runner==0.79.0",
 ]
 
 [project.optional-dependencies]

robotcode_debugger-0.79.0/src/robotcode/debugger/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.79.0"

{robotcode_debugger-0.78.4 → robotcode_debugger-0.79.0}/src/robotcode/debugger/listeners.py

@@ -6,6 +6,8 @@ from typing import Any, Dict, Iterator, List, Optional, Union, cast
 from robot import result, running
 from robot.model import Message
 
+from robotcode.core.utils.path import normalized_path
+
 from .dap_types import Event, Model
 from .debugger import Debugger
 
@@ -18,6 +20,14 @@ class RobotExecutionEventBody(Model):
     failed_keywords: Optional[List[Dict[str, Any]]] = None
 
 
+def source_from_attributes(attributes: Dict[str, Any]) -> str:
+    s = attributes.get("source", "")
+    if s:
+        return str(normalized_path(Path(s)))
+
+    return s or ""
+
+
 class ListenerV2:
     ROBOT_LISTENER_API_VERSION = "2"
 
@@ -32,7 +42,7 @@ class ListenerV2:
                 event="robotStarted",
                 body=RobotExecutionEventBody(
                     type="suite",
-                    id=f"{attributes.get('source', '')};{attributes.get('longname', '')}",
+                    id=f"{source_from_attributes(attributes)};{attributes.get('longname', '')}",
                     attributes=dict(attributes),
                 ),
             ),
@@ -54,7 +64,7 @@ class ListenerV2:
                 body=RobotExecutionEventBody(
                     type="suite",
                     attributes=dict(attributes),
-                    id=f"{attributes.get('source', '')};{attributes.get('longname', '')}",
+                    id=f"{source_from_attributes(attributes)};{attributes.get('longname', '')}",
                     failed_keywords=self.failed_keywords,
                 ),
             ),
@@ -71,7 +81,7 @@ class ListenerV2:
                 event="robotStarted",
                 body=RobotExecutionEventBody(
                     type="test",
-                    id=f"{attributes.get('source', '')};{attributes.get('longname', '')};"
+                    id=f"{source_from_attributes(attributes)};{attributes.get('longname', '')};"
                     f"{attributes.get('lineno', 0)}",
                     attributes=dict(attributes),
                 ),
@@ -93,7 +103,7 @@ class ListenerV2:
                 event="robotEnded",
                 body=RobotExecutionEventBody(
                     type="test",
-                    id=f"{attributes.get('source', '')};{attributes.get('longname', '')};"
+                    id=f"{source_from_attributes(attributes)};{attributes.get('longname', '')};"
                     f"{attributes.get('lineno', 0)}",
                     attributes=dict(attributes),
                     failed_keywords=self.failed_keywords,
@@ -142,9 +152,9 @@ class ListenerV2:
             item_id = next(
                 (
                     (
-                        f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname}"
+                        f"{normalized_path(Path(item.source)) if item.source is not None else ''};{item.longname}"
                         if item.type == "SUITE"
-                        else f"{Path(item.source).resolve() if item.source is not None else ''};"
+                        else f"{normalized_path(Path(item.source)) if item.source is not None else ''};"
                         f"{item.longname};{item.line}"
                     )
                     for item in Debugger.instance().full_stack_frames
@@ -189,9 +199,9 @@ class ListenerV2:
             item_id = next(
                 (
                     (
-                        f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname}"
+                        f"{normalized_path(Path(item.source)) if item.source is not None else ''};{item.longname}"
                         if item.type == "SUITE"
-                        else f"{Path(item.source).resolve() if item.source is not None else ''};"
+                        else f"{normalized_path(Path(item.source)) if item.source is not None else ''};"
                         f"{item.longname};{item.line}"
                     )
                     for item in Debugger.instance().full_stack_frames
@@ -266,7 +276,7 @@ class ListenerV3:
             item: Union[running.TestSuite, running.TestCase],
         ) -> Iterator[str]:
             if isinstance(item, running.TestSuite):
-                yield f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname}"
+                yield f"{normalized_path(item.source) if item.source is not None else ''};{item.longname}"
 
                 for s in item.suites:
                     yield from enqueue(s)
@@ -274,7 +284,7 @@ class ListenerV3:
                     yield from enqueue(s)
                 return
 
-            yield f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname};{item.lineno}"
+            yield (f"{normalized_path(item.source) if item.source is not None else ''};{item.longname};{item.lineno}")
 
         if self._event_sended:
             return

{robotcode_debugger-0.78.4 → robotcode_debugger-0.79.0}/src/robotcode/debugger/protocol.py

@@ -223,9 +223,9 @@ class DebugAdapterProtocol(JsonRPCProtocolBase):
         raise DebugAdapterRPCErrorException(
             f"Unknown Command '{message.command}'",
             error_message=Message(
-                format='Unknown command "{command}"',
-                variables={"command": str(message.command)},
-                show_user=True,
+                format='Unknown command "{command}": {request}',
+                variables={"command": str(message.command), "request": str(message)},
+                show_user=False,
             ),
         )
 

robotcode_debugger-0.78.4/src/robotcode/debugger/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.78.4"

{robotcode_debugger-0.78.4 → robotcode_debugger-0.79.0}/src/robotcode/debugger/run.py

@@ -208,10 +208,10 @@ async def run_debugger(
             wait_for_debugpy_connected()
 
         args = [
-            "--listener",
-            "robotcode.debugger.listeners.ListenerV2",
             "--listener",
             "robotcode.debugger.listeners.ListenerV3",
+            "--listener",
+            "robotcode.debugger.listeners.ListenerV2",
             *args,
         ]