Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ def send_message(self, payload: dict) -> int:
self._proc.stdin.flush()
return self.seq

@staticmethod
def _handle_message(
message: dict, debugger_state: DAPDebuggerState, logger: Logger
):
Expand Down Expand Up @@ -419,6 +420,7 @@ def _handle_message(
request_seq = message["request_seq"]
debugger_state.set_response(request_seq, message)

@staticmethod
def _colorize_dap_message(message: dict) -> dict:
colorized_message = copy.deepcopy(message)
if colorized_message["type"] == "event":
Expand All @@ -432,6 +434,7 @@ def _colorize_dap_message(message: dict) -> dict:
colorized_message["command"] = f"<y>{colorized_message['command']}</>"
return colorized_message

@staticmethod
def _read_dap_output(
proc: subprocess.Popen,
debugger_state: DAPDebuggerState,
Expand All @@ -454,6 +457,7 @@ def _read_dap_output(
DAP._handle_message(message, debugger_state, logger)
buffer = rest[content_length:]

@staticmethod
def _read_dap_err(proc: subprocess.Popen, logger: Logger):
while True:
err: bytes = proc.stderr.readline()
Expand Down Expand Up @@ -930,10 +934,16 @@ def evaluate_expression(self, expression, frame_idx=0) -> ValueIR:
)
)
eval_response = self._await_response(eval_req_id)
result: str = ""
if not eval_response["success"]:
result: str = eval_response["message"]
if eval_response["body"].get("error", None):
result = eval_response["body"]["error"]["format"]
elif eval_response["message"]:
result = eval_response["message"]
else:
result = "<unable to evaluate expression>"
else:
result: str = eval_response["body"]["result"]
result = eval_response["body"]["result"]
type_str = eval_response["body"].get("type")

return self._evaluate_result_value(expression, result, type_str)
Loading