Skip to content

Commit d45c0ca

Browse files
committed
debug: do not colorize in repl based on heuristics
fixes microsoft#34043
1 parent 6b16f46 commit d45c0ca

2 files changed

Lines changed: 17 additions & 9 deletions

File tree

src/vs/workbench/parts/debug/electron-browser/debugHover.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ export class DebugHoverWidget implements IContentWidget {
254254
this.valueContainer.hidden = false;
255255
renderExpressionValue(expression, this.valueContainer, {
256256
showChanged: false,
257-
preserveWhitespace: true
257+
preserveWhitespace: true,
258+
colorize: true
258259
});
259260
this.valueContainer.title = '';
260261
this.editor.layoutContentWidget(this);

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export interface IRenderValueOptions {
4848
showChanged?: boolean;
4949
maxValueLength?: number;
5050
showHover?: boolean;
51+
colorize?: boolean;
5152
}
5253

5354
function replaceWhitespace(value: string): string {
@@ -66,12 +67,16 @@ export function renderExpressionValue(expressionOrValue: debug.IExpression | str
6667
if (value !== Expression.DEFAULT_VALUE) {
6768
dom.addClass(container, 'error');
6869
}
69-
} else if (!isNaN(+value)) {
70-
dom.addClass(container, 'number');
71-
} else if (booleanRegex.test(value)) {
72-
dom.addClass(container, 'boolean');
73-
} else if (stringRegex.test(value)) {
74-
dom.addClass(container, 'string');
70+
}
71+
72+
if (options.colorize) {
73+
if (!isNaN(+value)) {
74+
dom.addClass(container, 'number');
75+
} else if (booleanRegex.test(value)) {
76+
dom.addClass(container, 'boolean');
77+
} else if (stringRegex.test(value)) {
78+
dom.addClass(container, 'string');
79+
}
7580
}
7681

7782
if (options.showChanged && (<any>expressionOrValue).valueChanged && value !== Expression.DEFAULT_VALUE) {
@@ -104,7 +109,8 @@ export function renderVariable(tree: ITree, variable: Variable, data: IVariableT
104109
showChanged,
105110
maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
106111
preserveWhitespace: false,
107-
showHover: true
112+
showHover: true,
113+
colorize: true
108114
});
109115
} else {
110116
data.value.textContent = '';
@@ -944,7 +950,8 @@ export class WatchExpressionsRenderer implements IRenderer {
944950
showChanged: true,
945951
maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
946952
preserveWhitespace: false,
947-
showHover: true
953+
showHover: true,
954+
colorize: true
948955
});
949956
data.name.title = watchExpression.type ? watchExpression.type : watchExpression.value;
950957
}

0 commit comments

Comments
 (0)