From 6641c6dd5029b1142e60bae351669cac5e3d2091 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 26 Oct 2016 15:13:49 +0200 Subject: [PATCH] debug: do not get named array variables and then all variables -> duplicates --- src/vs/workbench/parts/debug/common/debugModel.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 1552d493687..da4841443e8 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -159,6 +159,10 @@ export abstract class ExpressionContainer implements debug.IExpressionContainer if (this.reference <= 0) { this.children = TPromise.as([]); } else { + if (!this.getChildrenInChunks) { + return this.fetchVariables(undefined, undefined, undefined); + } + // Check if object has named variables, fetch them independent from indexed variables #9670 this.children = (!!this.namedVariables ? this.fetchVariables(undefined, undefined, 'named') : TPromise.as([])).then(childrenArray => { @@ -180,9 +184,7 @@ export abstract class ExpressionContainer implements debug.IExpressionContainer return childrenArray; } - const start = this.getChildrenInChunks ? this.startOfVariables : undefined; - const count = this.getChildrenInChunks ? this.indexedVariables : undefined; - return this.fetchVariables(start, count, this.getChildrenInChunks ? 'indexed' : undefined) + return this.fetchVariables(this.startOfVariables, this.indexedVariables, 'indexed') .then(variables => childrenArray.concat(variables)); }); } -- GitLab