Merge pull request microsoft#103841 from annkamsk/innerText-for-trivial-strings

jrieken · web-flow · commit a1b655340b9f · 2020-08-12T13:50:38.000+02:00
Replace `innerHTML` with `innerText` when assigning non-html string
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -187,14 +187,14 @@ class Label {
 
 		if (typeof label === 'string') {
 			if (!this.singleLabel) {
-				this.container.innerHTML = '';
+				this.container.innerText = '';
 				dom.removeClass(this.container, 'multiple');
 				this.singleLabel = dom.append(this.container, dom.$('a.label-name', { id: options?.domId }));
 			}
 
 			this.singleLabel.textContent = label;
 		} else {
-			this.container.innerHTML = '';
+			this.container.innerText = '';
 			dom.addClass(this.container, 'multiple');
 			this.singleLabel = undefined;
 
@@ -250,15 +250,15 @@ class LabelWithHighlights {
 
 		if (typeof label === 'string') {
 			if (!this.singleLabel) {
-				this.container.innerHTML = '';
+				this.container.innerText = '';
 				dom.removeClass(this.container, 'multiple');
 				this.singleLabel = new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId })), this.supportCodicons);
 			}
 
 			this.singleLabel.set(label, options?.matches, options?.title, options?.labelEscapeNewLines);
 		} else {
 
-			this.container.innerHTML = '';
+			this.container.innerText = '';
 			dom.addClass(this.container, 'multiple');
 			this.singleLabel = undefined;
 
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -170,7 +170,7 @@ export class InputBox extends Widget {
 			this.maxHeight = typeof this.options.flexibleMaxHeight === 'number' ? this.options.flexibleMaxHeight : Number.POSITIVE_INFINITY;
 
 			this.mirror = dom.append(wrapper, $('div.mirror'));
-			this.mirror.innerHTML = '&#160;';
+			this.mirror.innerText = '\u00a0';
 
 			this.scrollableElement = new ScrollableElement(this.element, { vertical: ScrollbarVisibility.Auto });
 
@@ -529,7 +529,7 @@ export class InputBox extends Widget {
 		if (mirrorTextContent) {
 			this.mirror.textContent = value + suffix;
 		} else {
-			this.mirror.innerHTML = '&#160;';
+			this.mirror.innerText = '\u00a0';
 		}
 
 		this.layout();
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -881,7 +881,7 @@ class TypeFilterController<T, TFilterData> implements IDisposable {
 			this.messageDomNode.textContent = localize('empty', "No elements found");
 			this._empty = true;
 		} else {
-			this.messageDomNode.innerHTML = '';
+			this.messageDomNode.innerText = '';
 			this._empty = false;
 		}
 
diff --git a/src/vs/base/parts/quickinput/browser/quickInput.ts b/src/vs/base/parts/quickinput/browser/quickInput.ts
@@ -278,7 +278,7 @@ class QuickInput extends Disposable implements IQuickInput {
 		if (title && this.ui.title.textContent !== title) {
 			this.ui.title.textContent = title;
 		} else if (!title && this.ui.title.innerHTML !== '&nbsp;') {
-			this.ui.title.innerHTML = '&nbsp;';
+			this.ui.title.innerText = '\u00a0;';
 		}
 		const description = this.getDescription();
 		if (this.ui.description.textContent !== description) {
diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
@@ -553,7 +553,7 @@ export class IssueReporter extends Disposable {
 
 	private clearSearchResults(): void {
 		const similarIssues = this.getElementById('similar-issues')!;
-		similarIssues.innerHTML = '';
+		similarIssues.innerText = '';
 		this.numberOfSearchResultsDisplayed = 0;
 	}
 
@@ -564,7 +564,7 @@ export class IssueReporter extends Disposable {
 
 		window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => {
 			response.json().then(result => {
-				similarIssues.innerHTML = '';
+				similarIssues.innerText = '';
 				if (result && result.items) {
 					this.displaySearchResults(result.items);
 				} else {
@@ -713,7 +713,7 @@ export class IssueReporter extends Disposable {
 			}
 		}
 
-		sourceSelect.innerHTML = '';
+		sourceSelect.innerText = '';
 		if (issueType === IssueType.FeatureRequest) {
 			sourceSelect.append(...[
 				this.makeOption('', localize('selectSource', "Select source"), true),
@@ -1079,7 +1079,7 @@ export class IssueReporter extends Disposable {
 	}
 
 	private updateExtensionTable(extensions: IssueReporterExtensionData[], numThemeExtensions: number): void {
-		const target = document.querySelector('.block-extensions .block-info');
+		const target = document.querySelector<HTMLElement>('.block-extensions .block-info');
 		if (target) {
 			if (this.configuration.disableExtensions) {
 				target.innerHTML = localize('disabledExtensions', "Extensions are disabled");
@@ -1090,7 +1090,7 @@ export class IssueReporter extends Disposable {
 			extensions = extensions || [];
 
 			if (!extensions.length) {
-				target.innerHTML = 'Extensions: none' + themeExclusionStr;
+				target.innerText = 'Extensions: none' + themeExclusionStr;
 				return;
 			}
 
@@ -1100,10 +1100,10 @@ export class IssueReporter extends Disposable {
 	}
 
 	private updateSearchedExtensionTable(extensions: IssueReporterExtensionData[]): void {
-		const target = document.querySelector('.block-searchedExtensions .block-info');
+		const target = document.querySelector<HTMLElement>('.block-searchedExtensions .block-info');
 		if (target) {
 			if (!extensions.length) {
-				target.innerHTML = 'Extensions: none';
+				target.innerText = 'Extensions: none';
 				return;
 			}
 
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
@@ -267,7 +267,7 @@ class ProcessExplorer {
 			return;
 		}
 
-		container.innerHTML = '';
+		container.innerText = '';
 		this.listeners.clear();
 
 		const tableHead = document.createElement('thead');
diff --git a/src/vs/editor/browser/config/charWidthReader.ts b/src/vs/editor/browser/config/charWidthReader.ts
@@ -124,12 +124,12 @@ class DomCharWidthReader {
 
 	private static _render(testElement: HTMLElement, request: CharWidthRequest): void {
 		if (request.chr === ' ') {
-			let htmlString = '&#160;';
+			let htmlString = '\u00a0';
 			// Repeat character 256 (2^8) times
 			for (let i = 0; i < 8; i++) {
 				htmlString += htmlString;
 			}
-			testElement.innerHTML = htmlString;
+			testElement.innerText = htmlString;
 		} else {
 			let testString = request.chr;
 			// Repeat character 256 (2^8) times
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
@@ -702,7 +702,7 @@ export class DiffReview extends Disposable {
 			if (originalLine !== 0) {
 				originalLineNumber.appendChild(document.createTextNode(String(originalLine)));
 			} else {
-				originalLineNumber.innerHTML = '&#160;';
+				originalLineNumber.innerText = '\u00a0';
 			}
 			cell.appendChild(originalLineNumber);
 
@@ -714,7 +714,7 @@ export class DiffReview extends Disposable {
 			if (modifiedLine !== 0) {
 				modifiedLineNumber.appendChild(document.createTextNode(String(modifiedLine)));
 			} else {
-				modifiedLineNumber.innerHTML = '&#160;';
+				modifiedLineNumber.innerText = '\u00a0';
 			}
 			cell.appendChild(modifiedLineNumber);
 
@@ -724,10 +724,10 @@ export class DiffReview extends Disposable {
 			if (spacerIcon) {
 				const spacerCodicon = document.createElement('span');
 				spacerCodicon.className = spacerIcon.classNames;
-				spacerCodicon.innerHTML = '&#160;&#160;';
+				spacerCodicon.innerText = '\u00a0\u00a0';
 				spacer.appendChild(spacerCodicon);
 			} else {
-				spacer.innerHTML = '&#160;&#160;';
+				spacer.innerText = '\u00a0\u00a0';
 			}
 			cell.appendChild(spacer);
 
diff --git a/src/vs/editor/contrib/codelens/codelensWidget.ts b/src/vs/editor/contrib/codelens/codelensWidget.ts
@@ -108,7 +108,7 @@ class CodeLensContentWidget implements IContentWidget {
 		} else {
 			// symbols and commands
 			if (!innerHtml) {
-				innerHtml = '&#160;';
+				innerHtml = '\u00a0';
 			}
 			this._domNode.innerHTML = innerHtml;
 			if (this._isEmpty && animate) {
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
@@ -194,8 +194,8 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 		dom.toggleClass(this.domNodes.element, 'multiple', multiple);
 		this.keyMultipleSignatures.set(multiple);
 
-		this.domNodes.signature.innerHTML = '';
-		this.domNodes.docs.innerHTML = '';
+		this.domNodes.signature.innerText = '';
+		this.domNodes.docs.innerText = '';
 
 		const signature = hints.signatures[hints.activeSignature];
 		if (!signature) {
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -373,7 +373,7 @@ class SuggestionDetails {
 			this.docs.textContent = documentation;
 		} else {
 			this.docs.classList.add('markdown-docs');
-			this.docs.innerHTML = '';
+			this.docs.innerText = '';
 			const renderedContents = this.markdownRenderer.render(documentation);
 			this.renderDisposeable = renderedContents;
 			this.docs.appendChild(renderedContents.element);
diff --git a/src/vs/editor/test/browser/controller/imeTester.ts b/src/vs/editor/test/browser/controller/imeTester.ts
@@ -74,7 +74,7 @@ function doCreateTest(description: string, inputStr: string, expectedStr: string
 	container.appendChild(title);
 
 	let startBtn = document.createElement('button');
-	startBtn.innerHTML = 'Start';
+	startBtn.innerText = 'Start';
 	container.appendChild(startBtn);
 
 
@@ -141,10 +141,10 @@ function doCreateTest(description: string, inputStr: string, expectedStr: string
 
 		let expected = 'some ' + expectedStr + ' text';
 		if (text === expected) {
-			check.innerHTML = '[GOOD]';
+			check.innerText = '[GOOD]';
 			check.className = 'check good';
 		} else {
-			check.innerHTML = '[BAD]';
+			check.innerText = '[BAD]';
 			check.className = 'check bad';
 		}
 		check.innerHTML += expected;
diff --git a/src/vs/workbench/browser/actions/developerActions.ts b/src/vs/workbench/browser/actions/developerActions.ts
@@ -179,7 +179,7 @@ class ToggleScreencastModeAction extends Action2 {
 					|| length > 20
 					|| event.keyCode === KeyCode.Backspace || event.keyCode === KeyCode.Escape
 				) {
-					keyboardMarker.innerHTML = '';
+					keyboardMarker.innerText = '';
 					length = 0;
 				}
 
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -98,7 +98,7 @@ class Item extends BreadcrumbsItem {
 		} else if (this.element instanceof OutlineModel) {
 			// has outline element but not in one
 			let label = document.createElement('div');
-			label.innerHTML = '&hellip;';
+			label.innerText = '\u2026';
 			label.className = 'hint-more';
 			container.appendChild(label);
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -58,7 +58,7 @@ class GridWidgetView<T extends IView> implements IView {
 	}
 
 	set gridWidget(grid: Grid<T> | undefined) {
-		this.element.innerHTML = '';
+		this.element.innerText = '';
 
 		if (grid) {
 			this.element.appendChild(grid.element);
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -506,7 +506,7 @@ export abstract class ViewPane extends Pane implements IView {
 
 		if (!this.shouldShowWelcome()) {
 			removeClass(this.bodyContainer, 'welcome');
-			this.viewWelcomeContainer.innerHTML = '';
+			this.viewWelcomeContainer.innerText = '';
 			this.scrollableElement.scanDomNode();
 			return;
 		}
@@ -515,14 +515,14 @@ export abstract class ViewPane extends Pane implements IView {
 
 		if (contents.length === 0) {
 			removeClass(this.bodyContainer, 'welcome');
-			this.viewWelcomeContainer.innerHTML = '';
+			this.viewWelcomeContainer.innerText = '';
 			this.scrollableElement.scanDomNode();
 			return;
 		}
 
 		const disposables = new DisposableStore();
 		addClass(this.bodyContainer, 'welcome');
-		this.viewWelcomeContainer.innerHTML = '';
+		this.viewWelcomeContainer.innerText = '';
 
 		let buttonIndex = 0;
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -120,7 +120,7 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 
 	renderElement(node: ITreeNode<CommentNode>, index: number, templateData: ICommentThreadTemplateData, height: number | undefined): void {
 		templateData.userName.textContent = node.element.comment.userName;
-		templateData.commentText.innerHTML = '';
+		templateData.commentText.innerText = '';
 		const disposables = new DisposableStore();
 		templateData.disposables.push(disposables);
 		const renderedComment = renderMarkdown(node.element.comment.body, {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -429,7 +429,7 @@ export class ExtensionEditor extends BaseEditor {
 		}
 
 		this.setSubText(extension, reloadAction, template);
-		template.content.innerHTML = ''; // Clear content before setting navbar actions.
+		template.content.innerText = ''; // Clear content before setting navbar actions.
 
 		template.navbar.clear();
 
@@ -560,7 +560,7 @@ export class ExtensionEditor extends BaseEditor {
 		}
 
 		this.contentDisposables.clear();
-		template.content.innerHTML = '';
+		template.content.innerText = '';
 		this.activeElement = null;
 		if (id) {
 			this.open(id, extension, template)
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -55,7 +55,7 @@ export class InstallCountWidget extends ExtensionWidget {
 	}
 
 	render(): void {
-		this.container.innerHTML = '';
+		this.container.innerText = '';
 
 		if (!this.extension) {
 			return;
@@ -105,7 +105,7 @@ export class RatingsWidget extends ExtensionWidget {
 	}
 
 	render(): void {
-		this.container.innerHTML = '';
+		this.container.innerText = '';
 
 		if (!this.extension) {
 			return;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -471,7 +471,7 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
 		templateData.currentRenderedCell = element;
 		templateData.currentEditor = undefined;
 		templateData.editorPart!.style.display = 'none';
-		templateData.cellContainer.innerHTML = '';
+		templateData.cellContainer.innerText = '';
 
 		if (height === undefined) {
 			return;
@@ -1139,7 +1139,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 			return;
 		}
 
-		templateData.outputContainer.innerHTML = '';
+		templateData.outputContainer.innerText = '';
 
 		const elementDisposables = templateData.elementDisposables;
 
@@ -1286,7 +1286,7 @@ export class RunStateRenderer {
 				}
 			}, RunStateRenderer.MIN_SPINNER_TIME);
 		} else {
-			this.element.innerHTML = '';
+			this.element.innerText = '';
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
@@ -177,7 +177,7 @@ export class StatefulMarkdownCell extends Disposable {
 			const lineHeight = this.viewCell.layoutInfo.fontInfo?.lineHeight || 17;
 			editorHeight = Math.max(lineNum, 1) * lineHeight + EDITOR_TOP_PADDING + EDITOR_BOTTOM_PADDING;
 
-			this.templateData.editorContainer.innerHTML = '';
+			this.templateData.editorContainer.innerText = '';
 
 			// create a special context key service that set the inCompositeEditor-contextkey
 			const editorContextKeyService = this.contextKeyService.createScoped();
@@ -241,7 +241,7 @@ export class StatefulMarkdownCell extends Disposable {
 
 		this.renderedEditors.delete(this.viewCell);
 
-		this.markdownContainer.innerHTML = '';
+		this.markdownContainer.innerText = '';
 		this.viewCell.clearHTML();
 		const markdownRenderer = this.viewCell.getMarkdownRenderer();
 		const renderedHTML = this.viewCell.getHTML();
@@ -261,7 +261,7 @@ export class StatefulMarkdownCell extends Disposable {
 			}));
 
 			this.localDisposables.add(this.viewCell.textBuffer.onDidChangeContent(() => {
-				this.markdownContainer.innerHTML = '';
+				this.markdownContainer.innerText = '';
 				this.viewCell.clearHTML();
 				const renderedHTML = this.viewCell.getHTML();
 				if (renderedHTML) {
@@ -312,7 +312,7 @@ export class StatefulMarkdownCell extends Disposable {
 	setFoldingIndicator() {
 		switch (this.foldingState) {
 			case CellFoldingState.None:
-				this.templateData.foldingIndicator.innerHTML = '';
+				this.templateData.foldingIndicator.innerText = '';
 				break;
 			case CellFoldingState.Collapsed:
 				this.templateData.foldingIndicator.innerHTML = renderCodicons('$(chevron-right)');
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts

Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ class TypeFilterController<T, TFilterData> implements IDisposable {`
`881`	`881`	`this.messageDomNode.textContent = localize('empty', "No elements found");`
`882`	`882`	`this._empty = true;`
`883`	`883`	`} else {`
`884`		`- this.messageDomNode.innerHTML = '';`
	`884`	`+ this.messageDomNode.innerText = '';`
`885`	`885`	`this._empty = false;`
`886`	`886`	`}`
`887`	`887`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ class QuickInput extends Disposable implements IQuickInput {`
`278`	`278`	`if (title && this.ui.title.textContent !== title) {`
`279`	`279`	`this.ui.title.textContent = title;`
`280`	`280`	`} else if (!title && this.ui.title.innerHTML !== ' ') {`
`281`		`- this.ui.title.innerHTML = ' ';`
	`281`	`+ this.ui.title.innerText = '\u00a0;';`
`282`	`282`	`}`
`283`	`283`	`const description = this.getDescription();`
`284`	`284`	`if (this.ui.description.textContent !== description) {`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ class ProcessExplorer {`
`267`	`267`	`return;`
`268`	`268`	`}`
`269`	`269`
`270`		`- container.innerHTML = '';`
	`270`	`+ container.innerText = '';`
`271`	`271`	`this.listeners.clear();`
`272`	`272`
`273`	`273`	`const tableHead = document.createElement('thead');`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ class CodeLensContentWidget implements IContentWidget {`
`108`	`108`	`} else {`
`109`	`109`	`// symbols and commands`
`110`	`110`	`if (!innerHtml) {`
`111`		`- innerHtml = ' ';`
	`111`	`+ innerHtml = '\u00a0';`
`112`	`112`	`}`
`113`	`113`	`this._domNode.innerHTML = innerHtml;`
`114`	`114`	`if (this._isEmpty && animate) {`