From 90c7b76f784dbedea017697272a36ef37a059720 Mon Sep 17 00:00:00 2001
From: gentoo90 <gentoo90@gmail.com>
Date: Sat, 10 Jun 2017 15:05:32 +0300
Subject: [PATCH] Add "var_" prefix to var object names

The name of var object should begin with a letter, so names like "_id"
caused errors.
---
 src/mibase.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mibase.ts b/src/mibase.ts
index d054823..0b623fd 100644
--- a/src/mibase.ts
+++ b/src/mibase.ts
@@ -335,22 +335,23 @@ export class MI2DebugSession extends DebugSession {
 				for (const variable of stack) {
 					if (this.useVarObjects) {
 						try {
+							let varObjName = `var_${variable.name}`;
 							let varObj: VariableObject;
 							try {
-								const changes = await this.miDebugger.varUpdate(variable.name);
+								const changes = await this.miDebugger.varUpdate(varObjName);
 								const changelist = changes.result("changelist");
 								changelist.forEach((change) => {
 									const name = MINode.valueOf(change, "name");
-									const vId = this.variableHandlesReverse[variable.name];
+									const vId = this.variableHandlesReverse[varObjName];
 									const v = this.variableHandles.get(vId) as any;
 									v.applyChanges(change);
 								});
-								const varId = this.variableHandlesReverse[variable.name];
+								const varId = this.variableHandlesReverse[varObjName];
 								varObj = this.variableHandles.get(varId) as any;
 							}
 							catch (err) {
 								if (err instanceof MIError && err.message == "Variable object not found") {
-									varObj = await this.miDebugger.varCreate(variable.name, variable.name);
+									varObj = await this.miDebugger.varCreate(variable.name, varObjName);
 									const varId = findOrCreateVariable(varObj);
 									varObj.exp = variable.name;
 									varObj.id = varId;