Replace innerHTML with innerText when assigning non-html string

annkamsk · annkamsk · commit 59ef2e37e79a · 2020-08-03T19:20:49.000+02:00
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 {
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/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/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/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
@@ -438,7 +438,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 = '';
 		let renderedHTML = element.getHTML();
 		if (renderedHTML) {
 			templateData.cellContainer.appendChild(renderedHTML);
@@ -1109,7 +1109,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 			return;
 		}
 
-		templateData.outputContainer.innerHTML = '';
+		templateData.outputContainer.innerText = '';
 
 		const elementDisposables = templateData.elementDisposables;
 
@@ -1256,7 +1256,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
@@ -176,7 +176,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();
@@ -239,7 +239,7 @@ export class StatefulMarkdownCell extends Disposable {
 
 		this.renderedEditors.delete(this.viewCell);
 
-		this.markdownContainer.innerHTML = '';
+		this.markdownContainer.innerText = '';
 		this.viewCell.clearHTML();
 		let markdownRenderer = this.viewCell.getMarkdownRenderer();
 		let renderedHTML = this.viewCell.getHTML();
@@ -259,7 +259,7 @@ export class StatefulMarkdownCell extends Disposable {
 			}));
 
 			this.localDisposables.add(this.viewCell.textBuffer.onDidChangeContent(() => {
-				this.markdownContainer.innerHTML = '';
+				this.markdownContainer.innerText = '';
 				this.viewCell.clearHTML();
 				let renderedHTML = this.viewCell.getHTML();
 				if (renderedHTML) {
@@ -310,7 +310,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
@@ -420,7 +420,7 @@ function webviewPreloads() {
 			case 'clear':
 				queuedOuputActions.clear(); // stop all loading outputs
 				onWillDestroyOutput.fire([undefined, undefined]);
-				document.getElementById('container')!.innerHTML = '';
+				document.getElementById('container')!.innerText = '';
 
 				outputObservers.forEach(ob => {
 					ob.disconnect();
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -636,7 +636,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 		template.labelElement.textContent = element.displayLabel;
 		template.labelElement.title = titleTooltip;
 
-		template.descriptionElement.innerHTML = '';
+		template.descriptionElement.innerText = '';
 		if (element.setting.descriptionIsMarkdown) {
 			const disposables = new DisposableStore();
 			template.toDispose.add(disposables);
@@ -649,7 +649,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 		const baseId = (element.displayCategory + '_' + element.displayLabel).replace(/ /g, '_').toLowerCase();
 		template.descriptionElement.id = baseId + '_setting_description';
 
-		template.otherOverridesElement.innerHTML = '';
+		template.otherOverridesElement.innerText = '';
 		template.otherOverridesElement.style.display = 'none';
 		if (element.overriddenScopeList.length) {
 			template.otherOverridesElement.style.display = 'inline';
@@ -686,7 +686,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 		if (deprecationText && element.setting.deprecationMessageIsMarkdown) {
 			const disposables = new DisposableStore();
 			template.elementDisposables.add(disposables);
-			template.deprecationWarningElement.innerHTML = '';
+			template.deprecationWarningElement.innerText = '';
 			template.deprecationWarningElement.appendChild(this.renderSettingMarkdown(element, element.setting.deprecationMessage!, template.elementDisposables));
 		} else {
 			template.deprecationWarningElement.innerText = deprecationText;
@@ -820,7 +820,7 @@ export class SettingGroupRenderer implements ITreeRenderer<SettingsTreeGroupElem
 	}
 
 	renderElement(element: ITreeNode<SettingsTreeGroupElement, never>, index: number, templateData: IGroupTitleTemplate): void {
-		templateData.parent.innerHTML = '';
+		templateData.parent.innerText = '';
 		const labelElement = DOM.append(templateData.parent, $('div.settings-group-title-label'));
 		labelElement.classList.add(`settings-group-level-${element.element.level}`);
 		labelElement.textContent = element.element.label;
@@ -1365,7 +1365,7 @@ export class SettingEnumRenderer extends AbstractSettingRenderer implements ITre
 		template.selectBox.select(idx);
 		template.onChange = idx => onChange(dataElement.setting.enum![idx]);
 
-		template.enumDescriptionElement.innerHTML = '';
+		template.enumDescriptionElement.innerText = '';
 	}
 }
 
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
@@ -63,7 +63,7 @@ class MyPart2 extends SimplePart {
 		const titleContainer = append(parent, $('div'));
 		const titleLabel = append(titleContainer, $('span'));
 		titleLabel.id = 'myPart.title';
-		titleLabel.innerHTML = 'Title';
+		titleLabel.innerText = 'Title';
 
 		return titleContainer;
 	}
@@ -72,7 +72,7 @@ class MyPart2 extends SimplePart {
 		const contentContainer = append(parent, $('div'));
 		const contentSpan = append(contentContainer, $('span'));
 		contentSpan.id = 'myPart.content';
-		contentSpan.innerHTML = 'Content';
+		contentSpan.innerText = 'Content';
 
 		return contentContainer;
 	}
@@ -92,7 +92,7 @@ class MyPart3 extends SimplePart {
 		const contentContainer = append(parent, $('div'));
 		const contentSpan = append(contentContainer, $('span'));
 		contentSpan.id = 'myPart.content';
-		contentSpan.innerHTML = 'Content';
+		contentSpan.innerText = 'Content';
 
 		return contentContainer;
 	}

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
`@@ -179,7 +179,7 @@ class ToggleScreencastModeAction extends Action2 {`
`179`	`179`	`\|\| length > 20`
`180`	`180`	`\|\| event.keyCode === KeyCode.Backspace \|\| event.keyCode === KeyCode.Escape`
`181`	`181`	`) {`
`182`		`- keyboardMarker.innerHTML = '';`
	`182`	`+ keyboardMarker.innerText = '';`
`183`	`183`	`length = 0;`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class GridWidgetView<T extends IView> implements IView {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`set gridWidget(grid: Grid<T> \| undefined) {`
`61`		`- this.element.innerHTML = '';`
	`61`	`+ this.element.innerText = '';`
`62`	`62`
`63`	`63`	`if (grid) {`
`64`	`64`	`this.element.appendChild(grid.element);`