From 4cbb822d3975452e1beb0d8826f0373c8a67a626 Mon Sep 17 00:00:00 2001
From: WebFreak001 <janju007@web.de>
Date: Thu, 10 Mar 2016 10:38:22 +0100
Subject: [PATCH] Fixed error messages for internal commands (fix #46)

---
 src/backend/mi2/mi2.ts | 2 +-
 src/mibase.ts          | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/backend/mi2/mi2.ts b/src/backend/mi2/mi2.ts
index d7eaffe..0de4202 100644
--- a/src/backend/mi2/mi2.ts
+++ b/src/backend/mi2/mi2.ts
@@ -258,7 +258,7 @@ export class MI2 extends EventEmitter implements IBackend {
 						handled = true;
 					}
 				}
-				if (parsed.resultRecords && parsed.resultRecords.resultClass == "error") {
+				if (!handled && parsed.resultRecords && parsed.resultRecords.resultClass == "error") {
 					this.log("stderr", parsed.result("msg") || line);
 				}
 				if (parsed.outOfBandRecord) {
diff --git a/src/mibase.ts b/src/mibase.ts
index 402def4..ee6ab94 100644
--- a/src/mibase.ts
+++ b/src/mibase.ts
@@ -172,7 +172,7 @@ export class MI2DebugSession extends DebugSession {
 				this.miDebugger.getStackVariables(1, parseInt(id.substr("@frame:".length))).then(stack => {
 					stack.forEach(variable => {
 						if (variable[1] !== undefined) {
-							let expanded = expandValue(createVariable, `{${variable[0]} = ${variable[1]}}`);
+							let expanded = expandValue(createVariable, "{" + variable[0] + "=" + variable[1] + ")");
 							if (!expanded)
 								new OutputEvent("Could not expand " + variable[1] + "\n", "stderr");
 							else if (typeof expanded[0] == "string")
@@ -196,7 +196,7 @@ export class MI2DebugSession extends DebugSession {
 					};
 					this.sendResponse(response);
 				}, err => {
-					this.sendErrorResponse(response, 1, `Could not expand variable: ${err}`);
+					this.sendErrorResponse(response, 1, "Could not expand variable: " + err);
 				});
 			}
 			else {
@@ -287,12 +287,16 @@ export class MI2DebugSession extends DebugSession {
 					result: res.result("value")
 				}
 				this.sendResponse(response);
+			}, msg => {
+				this.sendErrorResponse(response, 7, msg.toString());
 			});
 		else {
 			this.miDebugger.sendUserInput(args.expression).then(output => {
 				if (output)
 					response.body.result = JSON.stringify(output);
 				this.sendResponse(response);
+			}, msg => {
+				this.sendErrorResponse(response, 8, msg.toString());
 			});
 		}
 	}