Extract renderMarkdown

mjbvz · mjbvz · commit ea01b3949e02 · 2019-09-19T16:56:35.000-07:00
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -576,17 +576,15 @@ export class ExtensionEditor extends BaseEditor {
 
 	private async openMarkdown(cacheResult: CacheResult<string>, noContentCopy: string, template: IExtensionEditorTemplate): Promise<IActiveElement> {
 		try {
-			const contents = await this.loadContents(() => cacheResult, template);
-			const content = await renderMarkdownDocument(contents, this.extensionService, this.modeService);
-			const documentContent = await this.renderBody(content);
-			const body = removeEmbeddedSVGs(documentContent);
+			const body = await this.renderMarkdown(cacheResult, template);
 
 			const webviewElement = this.contentDisposables.add(this.webviewService.createWebviewEditorOverlay('extensionEditor', {
 				enableFindWidget: true,
 			}, {}));
 
 			webviewElement.claim(this);
 			webviewElement.layoutWebviewOverElement(template.content);
+			webviewElement.html = body;
 
 			this.contentDisposables.add(webviewElement.onDidFocus(() => this.fireOnDidFocus()));
 			const removeLayoutParticipant = arrays.insert(this.layoutParticipants, {
@@ -597,7 +595,6 @@ export class ExtensionEditor extends BaseEditor {
 			});
 
 			this.contentDisposables.add(toDisposable(removeLayoutParticipant));
-			webviewElement.html = body;
 
 			this.contentDisposables.add(webviewElement.onDidClickLink(link => {
 				if (!link) {
@@ -618,6 +615,13 @@ export class ExtensionEditor extends BaseEditor {
 		}
 	}
 
+	private async renderMarkdown(cacheResult: CacheResult<string>, template: IExtensionEditorTemplate) {
+		const contents = await this.loadContents(() => cacheResult, template);
+		const content = await renderMarkdownDocument(contents, this.extensionService, this.modeService);
+		const documentContent = await this.renderBody(content);
+		return removeEmbeddedSVGs(documentContent);
+	}
+
 	private async renderBody(body: string): Promise<string> {
 		const nonce = generateUuid();
 		const colorMap = TokenizationRegistry.getColorMap();
