Removes diffEditorWidget2 trusted type, uses diffEditorWidget TT instead. (microsoft#185895)

Author: hediet

src/vs/code/electron-sandbox/workbench/workbench-dev.html

@@ -51,7 +51,6 @@
 					cellRendererEditorText
 					defaultWorkerFactory
 					diffEditorWidget
-					diffEditorWidget2
 					diffReview
 					domLineBreaksComputer
 					dompurify

src/vs/code/electron-sandbox/workbench/workbench.html

@@ -51,7 +51,6 @@
 					cellRendererEditorText
 					defaultWorkerFactory
 					diffEditorWidget
-					diffEditorWidget2
 					diffReview
 					domLineBreaksComputer
 					dompurify

src/vs/editor/browser/widget/diffEditorWidget.ts

@@ -175,7 +175,7 @@ let DIFF_EDITOR_ID = 0;
 
 const diffInsertIcon = registerIcon('diff-insert', Codicon.add, nls.localize('diffInsertIcon', 'Line decoration for inserts in the diff editor.'));
 const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, nls.localize('diffRemoveIcon', 'Line decoration for removals in the diff editor.'));
-const ttPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
+export const diffEditorWidgetTtPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
 
 const ariaNavigationTip = nls.localize('diff-aria-navigation-tip', ' use Shift + F7 to navigate changes');
 
@@ -2588,7 +2588,7 @@ class InlineViewZonesComputer extends ViewZonesComputer {
 			maxCharsPerLine += scrollBeyondLastColumn;
 
 			const html = sb.build();
-			const trustedhtml = ttPolicy ? ttPolicy.createHTML(html) : html;
+			const trustedhtml = diffEditorWidgetTtPolicy ? diffEditorWidgetTtPolicy.createHTML(html) : html;
 			domNode.innerHTML = trustedhtml as string;
 			viewZone.minWidthInPx = (maxCharsPerLine * typicalHalfwidthCharacterWidth);
 

src/vs/editor/browser/widget/diffEditorWidget2/renderLines.ts

@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
 import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, EditorFontLigatures, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
+import { diffEditorWidgetTtPolicy } from 'vs/editor/browser/widget/diffEditorWidget';
+import { EditorFontLigatures, EditorOption, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
 import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
 import { ModelLineProjectionData } from 'vs/editor/common/modelLineProjectionData';
 import { IViewLineTokens, LineTokens } from 'vs/editor/common/tokens/lineTokens';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { renderViewLine, RenderLineInput } from 'vs/editor/common/viewLayout/viewLineRenderer';
+import { RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { InlineDecoration, ViewLineRenderingData } from 'vs/editor/common/viewModel';
 
-const ttPolicy = createTrustedTypesPolicy('diffEditorWidget2', { createHTML: value => value });
+const ttPolicy = diffEditorWidgetTtPolicy;
 
 export function renderLines(source: LineSource, options: RenderOptions, decorations: InlineDecoration[], domNode: HTMLElement): RenderLinesResult {
 	applyFontInfo(domNode, options.fontInfo);