maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

debug: only use : after name if there is a value

Browse source 
fixes #9775
This commit is contained in:
isidor 2016-07-27 09:58:23 +02:00
parent f76e090063
commit de177b62b9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/parts/debug/common/debugModel.ts
View file

@ -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));
}

6
src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
View file

@ -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;
}