fix variables for lldb-mi

WebFreak001 · Mar 13, 2024 · 86b6678 · 86b6678
1 parent 6942703
commit 86b6678
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/backend/mi2/mi2.ts b/src/backend/mi2/mi2.ts
@@ -675,6 +675,9 @@ export class MI2 extends EventEmitter implements IBackend {
 		const result = await this.sendCommand(command);
 		const threads = result.result("threads");
 		const ret: Thread[] = [];
+		if (!Array.isArray(threads)) { // workaround for lldb-mi bug: `'^done,threads="[]"'`
+			return ret;
+		}
 		return threads.map(element => {
 			const ret: Thread = {
 				id: parseInt(MINode.valueOf(element, "id")),

diff --git a/src/mibase.ts b/src/mibase.ts
@@ -482,7 +482,7 @@ export class MI2DebugSession extends DebugSession {
 									const varId = this.variableHandlesReverse[varObjName];
 									varObj = this.variableHandles.get(varId) as any;
 								} catch (err) {
-									if (err instanceof MIError && err.message == "Variable object not found") {
+									if (err instanceof MIError && (err.message == "Variable object not found" || err.message.endsWith("does not exist"))) {
 										varObj = await this.miDebugger.varCreate(id.threadId, id.level, variable.name, varObjName);
 										const varId = findOrCreateVariable(varObj);
 										varObj.exp = variable.name;