robotcode-debugger 1.3.0.dev3__tar.gz → 1.3.0.dev5__tar.gz

{robotcode_debugger-1.3.0.dev3 → robotcode_debugger-1.3.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotcode-debugger
-Version: 1.3.0.dev3
+Version: 1.3.0.dev5
 Summary: RobotCode Debugger for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -25,8 +25,8 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-jsonrpc2==1.3.0-dev.3
-Requires-Dist: robotcode-runner==1.3.0-dev.3
+Requires-Dist: robotcode-jsonrpc2==1.3.0-dev.5
+Requires-Dist: robotcode-runner==1.3.0-dev.5
 Requires-Dist: robotframework>=4.1.0
 Provides-Extra: debugpy
 Requires-Dist: debugpy; extra == 'debugpy'

{robotcode_debugger-1.3.0.dev3 → robotcode_debugger-1.3.0.dev5}/pyproject.toml

@@ -28,8 +28,8 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-jsonrpc2==1.3.0-dev.3",
-  "robotcode-runner==1.3.0-dev.3",
+  "robotcode-jsonrpc2==1.3.0-dev.5",
+  "robotcode-runner==1.3.0-dev.5",
 ]
 
 [project.optional-dependencies]

robotcode_debugger-1.3.0.dev5/src/robotcode/debugger/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.3.0-dev.5"

{robotcode_debugger-1.3.0.dev3 → robotcode_debugger-1.3.0.dev5}/src/robotcode/debugger/dap_types.py

@@ -622,6 +622,26 @@ class TerminateResponse(Response):
     pass
 
 
+class RestartArguments(Model):
+    arguments: Union[LaunchRequestArguments | AttachRequestArguments]
+
+
+@dataclass
+class _RestartRequest:
+    arguments: Optional[RestartArguments] = None
+
+
+@dataclass
+class RestartRequest(Request, _RestartRequest):
+    arguments: Optional[RestartArguments] = None
+    command: str = "restart"
+
+
+@dataclass
+class RestartResponse(Response):
+    pass
+
+
 @dataclass
 class StackFrameFormat(Model):
     parameters: Optional[bool] = None

{robotcode_debugger-1.3.0.dev3 → robotcode_debugger-1.3.0.dev5}/src/robotcode/debugger/debugger.py

@@ -449,6 +449,10 @@ class Debugger:
         if not self.main_thread_is_alive and thread_id != self.main_thread_id:
             raise InvalidThreadIdError(thread_id, self.main_thread_id)
 
+    def continue_all_if_paused(self) -> None:
+        if self.state == State.Paused:
+            self.continue_all()
+
     def continue_all(self) -> None:
         if self.main_thread_is_alive:
             self.continue_thread(self.main_thread_id)
@@ -1781,29 +1785,40 @@ class Debugger:
                         result = None
 
                         if len(test.body):
-                            for kw in test.body:
-                                with LOGGER.delayed_logging:
-                                    try:
-                                        result = self._run_keyword(kw, evaluate_context)
-                                    except (SystemExit, KeyboardInterrupt):
-                                        raise
-                                    except BaseException as e:
-                                        result = e
-                                        break
-                                    finally:
-                                        if get_robot_version() <= (7, 2):
-                                            messages = LOGGER._log_message_cache or []
-                                            for msg in messages or ():
-                                                # hack to get and evaluate log level
-                                                listener: Any = next(iter(LOGGER), None)
-                                                if listener is None or self.check_message_is_logged(listener, msg):
-                                                    self.log_message(
-                                                        {
-                                                            "level": msg.level,
-                                                            "message": msg.message,
-                                                            "timestamp": msg.timestamp,
-                                                        }
-                                                    )
+                            if get_robot_version() >= (7, 3):
+                                for kw in test.body:
+                                    with evaluate_context.output.delayed_logging:
+                                        try:
+                                            result = self._run_keyword(kw, evaluate_context)
+                                        except (SystemExit, KeyboardInterrupt):
+                                            raise
+                                        except BaseException as e:
+                                            result = e
+                                            break
+                            else:
+                                for kw in test.body:
+                                    with LOGGER.delayed_logging:
+                                        try:
+                                            result = self._run_keyword(kw, evaluate_context)
+                                        except (SystemExit, KeyboardInterrupt):
+                                            raise
+                                        except BaseException as e:
+                                            result = e
+                                            break
+                                        finally:
+                                            if get_robot_version() <= (7, 2):
+                                                messages = LOGGER._log_message_cache or []
+                                                for msg in messages or ():
+                                                    # hack to get and evaluate log level
+                                                    listener: Any = next(iter(LOGGER), None)
+                                                    if listener is None or self.check_message_is_logged(listener, msg):
+                                                        self.log_message(
+                                                            {
+                                                                "level": msg.level,
+                                                                "message": msg.message,
+                                                                "timestamp": msg.timestamp,
+                                                            }
+                                                        )
                         return result
 
                     result = self.run_in_robot_thread(run_kw)

{robotcode_debugger-1.3.0.dev3 → robotcode_debugger-1.3.0.dev5}/src/robotcode/debugger/run.py

@@ -260,12 +260,12 @@ def run_debugger(
                     )
                 )
 
-                server.protocol.exit(exit_code)
     except CancelledError:
         pass
     finally:
         if server.protocol.connected:
             server.protocol.terminate()
+            server.protocol.exit(exit_code)
 
             if not server.protocol.wait_for_disconnected():
                 app.verbose("Timeout to get disconnected from client")

{robotcode_debugger-1.3.0.dev3 → robotcode_debugger-1.3.0.dev5}/src/robotcode/debugger/server.py

@@ -189,19 +189,21 @@ class DebugAdapterServerProtocol(DebugAdapterProtocol):
     async def _terminate(
         self,
         arguments: Optional[TerminateArguments] = None,
+        restart: Optional[bool] = None,
         *args: Any,
         **kwargs: Any,
     ) -> None:
-        if not self._sigint_signaled:
+        Debugger.instance().terminate()
+
+        if not restart and not self._sigint_signaled:
             self._logger.info("Send SIGINT to process")
             signal.raise_signal(signal.SIGINT)
             self._sigint_signaled = True
-            # Debugger.instance().continue_all()
+
+            Debugger.instance().continue_all_if_paused()
         else:
             await self.send_event_async(Event("terminateRequested"))
 
-            Debugger.instance().terminate()
-
             self._logger.info("Send SIGTERM to process")
             signal.raise_signal(signal.SIGTERM)
 

robotcode_debugger-1.3.0.dev3/src/robotcode/debugger/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.3.0-dev.3"