From de177b62b99a35e8fa58605ce2d150651160eaf5 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 27 Jul 2016 09:58:23 +0200 Subject: [PATCH] debug: only use : after name if there is a value fixes #9775 --- src/vs/workbench/parts/debug/common/debugModel.ts | 2 +- .../workbench/parts/debug/electron-browser/debugViewer.ts | 6 ++++-- 2 files 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 8457acc18d2..819d636cdd4 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -257,7 +257,7 @@ export abstract class ExpressionContainer implements debug.IExpressionContainer const numberOfChunks = this.indexedVariables / ExpressionContainer.CHUNK_SIZE; for (let i = 0; i < numberOfChunks; i++) { const chunkSize = Math.min(ExpressionContainer.CHUNK_SIZE, this.indexedVariables - i * ExpressionContainer.CHUNK_SIZE); - const chunkName = `${i * ExpressionContainer.CHUNK_SIZE}..${i * ExpressionContainer.CHUNK_SIZE + chunkSize - 1}`; + const chunkName = `${i * ExpressionContainer.CHUNK_SIZE} \u2026 ${i * ExpressionContainer.CHUNK_SIZE + chunkSize - 1}`; childrenArray.push(new Variable(this, this.reference, chunkName, '', null, chunkSize, null, true, i)); } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts index eda16d47a3e..fbfcec5871a 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts @@ -71,11 +71,12 @@ export function renderExpressionValue(expressionOrValue: debug.IExpression | str export function renderVariable(tree: tree.ITree, variable: model.Variable, data: IVariableTemplateData, showChanged: boolean): void { if (variable.available) { - data.name.textContent = variable.name + ':'; + data.name.textContent = variable.name; data.name.title = variable.type ? variable.type : ''; } if (variable.value) { + data.name.textContent += ':'; renderExpressionValue(variable, data.value, showChanged, MAX_VALUE_RENDER_LENGTH_IN_VIEWLET); data.value.title = variable.value; } else { @@ -884,8 +885,9 @@ export class WatchExpressionsRenderer implements tree.IRenderer { } data.actionBar.context = watchExpression; - data.name.textContent = `${watchExpression.name}:`; + data.name.textContent = watchExpression.name; if (watchExpression.value) { + data.name.textContent += ':'; renderExpressionValue(watchExpression, data.value, true, MAX_VALUE_RENDER_LENGTH_IN_VIEWLET); data.name.title = watchExpression.type ? watchExpression.type : watchExpression.value; } -- GitLab