Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-27 02:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

debug: remove heuristic for evaluate name

Browse Source 
fixes #25166
This commit is contained in:
isidor
2017-05-04 15:23:43 +02:00
parent f0c8d28e3d
commit 00cbee4bbf
1 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/debug/common/debugModel.ts
+1 -32
View File
@@ -250,15 +250,13 @@ export class Variable extends ExpressionContainer implements IExpression {
// Used to show the error message coming from the adapter when setting the value #7807
public errorMessage: string;
private static NOT_PROPERTY_SYNTAX = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
private static ARRAY_ELEMENT_SYNTAX = /\[.*\]$/;
constructor(
process: IProcess,
public parent: IExpressionContainer,
reference: number,
public name: string,
private _evaluateName: string,
public evaluateName: string,
value: string,
namedVariables: number,
indexedVariables: number,
@@ -270,35 +268,6 @@ export class Variable extends ExpressionContainer implements IExpression {
this.value = value;
}
public get evaluateName(): string {
if (this._evaluateName) {
return this._evaluateName;
}
// TODO@Isidor get rid of this ugly heuristic
let names = [this.name];
let v = this.parent;
while (v instanceof Variable || v instanceof Expression) {
names.push((<Variable>v).name);
v = (<Variable>v).parent;
}
names = names.reverse();
let result = null;
names.forEach(name => {
if (!result) {
result = name;
} else if (Variable.ARRAY_ELEMENT_SYNTAX.test(name) || (this.process.configuration.type === 'node' && !Variable.NOT_PROPERTY_SYNTAX.test(name))) {
// use safe way to access node properties a['property_name']. Also handles array elements.
result = name && name.indexOf('[') === 0 ? `${result}${name}` : `${result}['${name}']`;
} else {
result = `${result}.${name}`;
}
});
return result;
}
public setVariable(value: string): TPromise<any> {
return this.process.session.setVariable({
name: this.name,