debug: do not massage whitespace anymore

fixes #73845
microsoft · Feb 5, 2020 · f647e12 · f647e12
1 parent d0d1df6
commit f647e12
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 28 deletions.
diff --git a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
@@ -27,7 +27,6 @@ const stringRegex = /^(['"]).*\1$/;
 const $ = dom.$;
 
 export interface IRenderValueOptions {
-	preserveWhitespace?: boolean;
 	showChanged?: boolean;
 	maxValueLength?: number;
 	showHover?: boolean;
@@ -49,11 +48,6 @@ export function renderViewTree(container: HTMLElement): HTMLElement {
 	return treeContainer;
 }
 
-export function replaceWhitespace(value: string): string {
-	const map: { [x: string]: string } = { '\n': '\\n', '\r': '\\r', '\t': '\\t' };
-	return value.replace(/[\n\r\t]/g, char => map[char]);
-}
-
 export function renderExpressionValue(expressionOrValue: IExpressionContainer | string, container: HTMLElement, options: IRenderValueOptions): void {
 	let value = typeof expressionOrValue === 'string' ? expressionOrValue : expressionOrValue.value;
 
@@ -86,11 +80,10 @@ export function renderExpressionValue(expressionOrValue: IExpressionContainer |
 	if (options.maxValueLength && value && value.length > options.maxValueLength) {
 		value = value.substr(0, options.maxValueLength) + '...';
 	}
-	if (value && !options.preserveWhitespace) {
-		value = replaceWhitespace(value);
-	} else {
-		value = value || '';
+	if (!value) {
+		value = '';
 	}
+
 	if (options.linkDetector) {
 		container.textContent = '';
 		const session = (expressionOrValue instanceof ExpressionContainer) ? expressionOrValue.getSession() : undefined;
@@ -105,7 +98,7 @@ export function renderExpressionValue(expressionOrValue: IExpressionContainer |
 
 export function renderVariable(variable: Variable, data: IVariableTemplateData, showChanged: boolean, highlights: IHighlight[], linkDetector?: LinkDetector): void {
 	if (variable.available) {
-		let text = replaceWhitespace(variable.name);
+		let text = variable.name;
 		if (variable.value && typeof variable.name === 'string') {
 			text += ':';
 		}
@@ -118,7 +111,6 @@ export function renderVariable(variable: Variable, data: IVariableTemplateData,
 	renderExpressionValue(variable, data.value, {
 		showChanged,
 		maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-		preserveWhitespace: false,
 		showHover: true,
 		colorize: true,
 		linkDetector
@@ -185,7 +177,7 @@ export abstract class AbstractExpressionsRenderer implements ITreeRenderer<IExpr
 		const inputBox = new InputBox(inputBoxContainer, this.contextViewService, options);
 		const styler = attachInputBoxStyler(inputBox, this.themeService);
 
-		inputBox.value = replaceWhitespace(options.initialValue);
+		inputBox.value = options.initialValue;
 		inputBox.focus();
 		inputBox.select();
 

diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -16,7 +16,7 @@ import { IContentWidget, ICodeEditor, IContentWidgetPosition, ContentWidgetPosit
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDebugService, IExpression, IExpressionContainer, IStackFrame } from 'vs/workbench/contrib/debug/common/debug';
 import { Expression } from 'vs/workbench/contrib/debug/common/debugModel';
-import { renderExpressionValue, replaceWhitespace } from 'vs/workbench/contrib/debug/browser/baseDebugView';
+import { renderExpressionValue } from 'vs/workbench/contrib/debug/browser/baseDebugView';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -230,7 +230,6 @@ export class DebugHoverWidget implements IContentWidget {
 			this.valueContainer.hidden = false;
 			renderExpressionValue(expression, this.valueContainer, {
 				showChanged: false,
-				preserveWhitespace: true,
 				colorize: true
 			});
 			this.valueContainer.title = '';
@@ -248,7 +247,7 @@ export class DebugHoverWidget implements IContentWidget {
 		this.complexValueContainer.hidden = false;
 
 		await this.tree.setInput(expression);
-		this.complexValueTitle.textContent = replaceWhitespace(expression.value);
+		this.complexValueTitle.textContent = expression.value;
 		this.complexValueTitle.title = expression.value;
 		this.layoutTreeAndContainer();
 		this.editor.layoutContentWidget(this);

diff --git a/src/vs/workbench/contrib/debug/browser/replViewer.ts b/src/vs/workbench/contrib/debug/browser/replViewer.ts
@@ -96,7 +96,6 @@ export class ReplEvaluationResultsRenderer implements ITreeRenderer<ReplEvaluati
 	renderElement(element: ITreeNode<ReplEvaluationResult, FuzzyScore>, index: number, templateData: IReplEvaluationResultTemplateData): void {
 		const expression = element.element;
 		renderExpressionValue(expression, templateData.value, {
-			preserveWhitespace: !expression.hasChildren,
 			showHover: false,
 			colorize: true,
 			linkDetector: this.linkDetector
@@ -230,7 +229,6 @@ export class ReplRawObjectsRenderer implements ITreeRenderer<RawObjectReplElemen
 
 		// value
 		renderExpressionValue(element.value, templateData.value, {
-			preserveWhitespace: true,
 			showHover: false,
 			linkDetector: this.linkDetector
 		});

diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -267,7 +267,6 @@ export class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 		renderExpressionValue(expression, data.value, {
 			showChanged: true,
 			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-			preserveWhitespace: false,
 			showHover: true,
 			colorize: true
 		});

diff --git a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { replaceWhitespace, renderExpressionValue, renderVariable, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
+import { renderExpressionValue, renderVariable, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
 import * as dom from 'vs/base/browser/dom';
 import { Expression, Variable, Scope, StackFrame, Thread, DebugModel } from 'vs/workbench/contrib/debug/common/debugModel';
 import { MockSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
@@ -29,13 +29,6 @@ suite('Debug - Base Debug View', () => {
 		linkDetector = instantiationService.createInstance(LinkDetector);
 	});
 
-	test('replace whitespace', () => {
-		assert.equal(replaceWhitespace('hey there'), 'hey there');
-		assert.equal(replaceWhitespace('hey there\n'), 'hey there\\n');
-		assert.equal(replaceWhitespace('hey \r there\n\t'), 'hey \\r there\\n\\t');
-		assert.equal(replaceWhitespace('hey \r\t\n\t\t\n there'), 'hey \\r\\t\\n\\t\\t\\n there');
-	});
-
 	test('render view tree', () => {
 		const container = $('.container');
 		const treeContainer = renderViewTree(container);
@@ -48,7 +41,7 @@ suite('Debug - Base Debug View', () => {
 
 	test('render expression value', () => {
 		let container = $('.container');
-		renderExpressionValue('render \n me', container, { showHover: true, preserveWhitespace: true });
+		renderExpressionValue('render \n me', container, { showHover: true });
 		assert.equal(container.className, 'value');
 		assert.equal(container.title, 'render \n me');
 		assert.equal(container.textContent, 'render \n me');