trusted types - use textContent for style elements, fyi @rebornix

jrieken · jrieken · commit 758f35532b60 · 2020-09-09T14:37:27.000+02:00
diff --git a/.vscode/searches/TrustedTypes.code-search b/.vscode/searches/TrustedTypes.code-search
@@ -4,7 +4,7 @@
 # Excluding: *.test.ts
 # ContextLines: 3
 
-44 results - 27 files
+42 results - 25 files
 
 src/vs/base/browser/markdownRenderer.ts:
   156  				const strValue = values[0];
@@ -267,24 +267,6 @@ src/vs/workbench/contrib/debug/browser/repl.ts:
   311  					font-size: ${fontSize}px;
   312  					font-family: ${fontFamily};
 
-src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts:
-  222  
-  223  		const newStyles = content.join('\n');
-  224  		if (newStyles !== this.styleElement.innerHTML) {
-  225: 			this.styleElement.innerHTML = newStyles;
-  226  		}
-  227  	}
-  228  }
-
-src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts:
-  1033  
-  1034  		const newStyles = content.join('\n');
-  1035  		if (newStyles !== this.styleElement.innerHTML) {
-  1036: 			this.styleElement.innerHTML = newStyles;
-  1037  		}
-  1038  	}
-  1039  
-
 src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts:
   454  
   455  	private getMarkdownDragImage(templateData: MarkdownCellRenderTemplate): HTMLElement {
@@ -335,7 +317,6 @@ src/vs/workbench/contrib/webview/browser/webviewIconManager.ts:
   64: 		this._styleElement.innerHTML = cssRules.join('\n');
   65  	}
   66  }
-  67  
 
 src/vs/workbench/contrib/webview/browser/pre/main.js:
   386  			// apply default styles
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts
@@ -221,8 +221,8 @@ export class NotebookTextDiffList extends WorkbenchList<CellDiffViewModel> imple
 		}
 
 		const newStyles = content.join('\n');
-		if (newStyles !== this.styleElement.innerHTML) {
-			this.styleElement.innerHTML = newStyles;
+		if (newStyles !== this.styleElement.textContent) {
+			this.styleElement.textContent = newStyles;
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -1032,8 +1032,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		}
 
 		const newStyles = content.join('\n');
-		if (newStyles !== this.styleElement.innerHTML) {
-			this.styleElement.innerHTML = newStyles;
+		if (newStyles !== this.styleElement.textContent) {
+			this.styleElement.textContent = newStyles;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,8 @@ export class NotebookTextDiffList extends WorkbenchList<CellDiffViewModel> imple`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`const newStyles = content.join('\n');`
`224`		`- if (newStyles !== this.styleElement.innerHTML) {`
`225`		`- this.styleElement.innerHTML = newStyles;`
	`224`	`+ if (newStyles !== this.styleElement.textContent) {`
	`225`	`+ this.styleElement.textContent = newStyles;`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1032,8 +1032,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID`
`1032`	`1032`	`}`
`1033`	`1033`
`1034`	`1034`	`const newStyles = content.join('\n');`
`1035`		`- if (newStyles !== this.styleElement.innerHTML) {`
`1036`		`- this.styleElement.innerHTML = newStyles;`
	`1035`	`+ if (newStyles !== this.styleElement.textContent) {`
	`1036`	`+ this.styleElement.textContent = newStyles;`
`1037`	`1037`	`}`
`1038`	`1038`	`}`
`1039`	`1039`