提交 6641c6dd 编写于 作者: I isidor

debug: do not get named array variables and then all variables -> duplicates

上级 2c09acb9
...@@ -159,6 +159,10 @@ export abstract class ExpressionContainer implements debug.IExpressionContainer ...@@ -159,6 +159,10 @@ export abstract class ExpressionContainer implements debug.IExpressionContainer
if (this.reference <= 0) { if (this.reference <= 0) {
this.children = TPromise.as([]); this.children = TPromise.as([]);
} else { } else {
if (!this.getChildrenInChunks) {
return this.fetchVariables(undefined, undefined, undefined);
}
// Check if object has named variables, fetch them independent from indexed variables #9670 // Check if object has named variables, fetch them independent from indexed variables #9670
this.children = (!!this.namedVariables ? this.fetchVariables(undefined, undefined, 'named') this.children = (!!this.namedVariables ? this.fetchVariables(undefined, undefined, 'named')
: TPromise.as([])).then(childrenArray => { : TPromise.as([])).then(childrenArray => {
...@@ -180,9 +184,7 @@ export abstract class ExpressionContainer implements debug.IExpressionContainer ...@@ -180,9 +184,7 @@ export abstract class ExpressionContainer implements debug.IExpressionContainer
return childrenArray; return childrenArray;
} }
const start = this.getChildrenInChunks ? this.startOfVariables : undefined; return this.fetchVariables(this.startOfVariables, this.indexedVariables, 'indexed')
const count = this.getChildrenInChunks ? this.indexedVariables : undefined;
return this.fetchVariables(start, count, this.getChildrenInChunks ? 'indexed' : undefined)
.then(variables => childrenArray.concat(variables)); .then(variables => childrenArray.concat(variables));
}); });
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册