robotcode-debugger 1.0.2__tar.gz → 1.1.0__tar.gz

{robotcode_debugger-1.0.2 → robotcode_debugger-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotcode-debugger
-Version: 1.0.2
+Version: 1.1.0
 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.0.2
-Requires-Dist: robotcode-runner==1.0.2
+Requires-Dist: robotcode-jsonrpc2==1.1.0
+Requires-Dist: robotcode-runner==1.1.0
 Requires-Dist: robotframework>=4.1.0
 Provides-Extra: debugpy
 Requires-Dist: debugpy; extra == 'debugpy'

{robotcode_debugger-1.0.2 → robotcode_debugger-1.1.0}/pyproject.toml

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

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

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

{robotcode_debugger-1.0.2 → robotcode_debugger-1.1.0}/src/robotcode/debugger/debugger.py

@@ -547,7 +547,6 @@ class Debugger:
         lines: Optional[List[int]] = None,
         source_modified: Optional[bool] = None,
     ) -> List[Breakpoint]:
-
         if self.is_windows_path(source.path or ""):
             path: pathlib.PurePath = pathlib.PureWindowsPath(source.path or "")
         else:
@@ -647,7 +646,6 @@ class Debugger:
             if source_path in self.breakpoints:
                 breakpoints = [v for v in self.breakpoints[source_path].breakpoints if v.line == line_no]
                 if len(breakpoints) > 0:
-
                     for point in breakpoints:
                         if point.condition is not None:
                             hit = False
@@ -1637,8 +1635,8 @@ class Debugger:
 
         return list(result.values())
 
-    IS_VARIABLE_RE: ClassVar = re.compile(r"^[$@&%]\{.*\}(\[[^\]]*\])?$")
-    IS_VARIABLE_ASSIGNMENT_RE: ClassVar = re.compile(r"^[$@&%]\{.*\}=?$")
+    IS_VARIABLE_RE: ClassVar = re.compile(r"^[$@&]\{.*\}(\[[^\]]*\])?$")
+    IS_VARIABLE_ASSIGNMENT_RE: ClassVar = re.compile(r"^[$@&]\{.*\}=?$")
     SPLIT_LINE: ClassVar = re.compile(r"(?= {2,}| ?\t)\s*")
     CURRDIR: ClassVar = re.compile(r"(?i)\$\{CURDIR\}")
 
@@ -1762,8 +1760,10 @@ class Debugger:
                 else:
                     result = internal_evaluate_expression(vars.replace_string(expression), vars)
             else:
-                if self.IS_VARIABLE_RE.match(expression.strip()):
-                    result = vars[expression.strip()]
+                parts = self.SPLIT_LINE.split(expression.strip())
+                if parts and len(parts) == 1 and self.IS_VARIABLE_RE.match(parts[0].strip()):
+                    # result = vars[parts[0].strip()]
+                    result = vars.replace_scalar(parts[0].strip())
                 else:
 
                     def get_test_body_from_string(command: str) -> TestCase:

{robotcode_debugger-1.0.2 → robotcode_debugger-1.1.0}/src/robotcode/debugger/launcher/server.py

@@ -143,8 +143,8 @@ class LauncherDebugAdapterProtocol(DebugAdapterProtocol):
         robotcode_run_args = [
             python or sys.executable,
             *debugger_script,
-            *itertools.chain.from_iterable(["--profile", p] for p in profiles or []),
-            *itertools.chain.from_iterable(["--default-path", p] for p in paths or []),
+            *itertools.chain.from_iterable(["-p", p] for p in profiles or []),
+            *itertools.chain.from_iterable(["-dp", p] for p in paths or []),
             *(robotCodeArgs or []),
             "debug",
         ]
@@ -245,7 +245,9 @@ class LauncherDebugAdapterProtocol(DebugAdapterProtocol):
                         kind=(
                             RunInTerminalKind.INTEGRATED
                             if console == "integratedTerminal"
-                            else RunInTerminalKind.EXTERNAL if console == "externalTerminal" else None
+                            else RunInTerminalKind.EXTERNAL
+                            if console == "externalTerminal"
+                            else None
                         ),
                         title=name,
                     )

{robotcode_debugger-1.0.2 → robotcode_debugger-1.1.0}/src/robotcode/debugger/protocol.py

@@ -44,7 +44,7 @@ class DebugAdapterErrorResponseError(JsonRPCException):
     def __init__(self, error: ErrorResponse) -> None:
         super().__init__(
             f'{error.message} (seq={error.request_seq} command="{error.command}")'
-            f'{f": {error.body.error}" if error.body is not None and error.body.error else ""}'
+            f"{f': {error.body.error}' if error.body is not None and error.body.error else ''}"
         )
         self.error = error
 
@@ -60,7 +60,7 @@ class DebugAdapterRPCErrorException(JsonRPCException):
     ) -> None:
         super().__init__(
             f'{(message + " ") if message else ""}(seq={request_seq} command="{command}")'
-            f'{f": {error_message}" if error_message else ""}'
+            f"{f': {error_message}' if error_message else ''}"
         )
         self.message = message
         self.request_seq = request_seq

{robotcode_debugger-1.0.2 → robotcode_debugger-1.1.0}/src/robotcode/debugger/run.py

@@ -114,11 +114,10 @@ def start_debugpy(
     if port != debugpy_port:
         _logger.warning(lambda: f"start debugpy session on port {port}")
 
-    # this is set by vscode for non config debugpy sessions, we don't need it, so remove it
-    if "DEBUGPY_ADAPTER_ENDPOINTS" in os.environ:
-        del os.environ["DEBUGPY_ADAPTER_ENDPOINTS"]
-    if "VSCODE_DEBUGPY_ADAPTER_ENDPOINTS" in os.environ:
-        del os.environ["VSCODE_DEBUGPY_ADAPTER_ENDPOINTS"]
+    # remove unwanted env variables
+    for env_var in ["DEBUGPY_ADAPTER_ENDPOINTS", "VSCODE_DEBUGPY_ADAPTER_ENDPOINTS"]:
+        if env_var in os.environ:
+            del os.environ[env_var]
 
     if enable_debugpy(port, addresses):
         global config_done_callback

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

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