Let webview editors show in diff original view too

mjbvz · mjbvz · commit 04da82c1d234 · 2019-09-16T14:17:34.000-07:00
Fixes microsoft#80740 The original view in diff views uses a data uri instead of a resource on disk. Make sure our webview editors can register themselves to handle this case too
diff --git a/extensions/image-preview/package.json b/extensions/image-preview/package.json
@@ -24,7 +24,8 @@
         "displayName": "%webviewEditors.displayName%",
         "selector": [
           {
-            "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,tga,tif,tiff,webp}"
+            "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,tga,tif,tiff,webp}",
+            "mime": "image/*"
           }
         ]
       }
diff --git a/extensions/image-preview/src/preview.ts b/extensions/image-preview/src/preview.ts
@@ -81,7 +81,7 @@ export class Preview extends Disposable {
 	private getWebiewContents(webviewEditor: vscode.WebviewEditor, resource: vscode.Uri): string {
 		const settings = {
 			isMac: process.platform === 'darwin',
-			src: encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true))
+			src: this.getResourcePath(webviewEditor, resource)
 		};
 
 		return /* html */`<!DOCTYPE html>
@@ -101,6 +101,14 @@ export class Preview extends Disposable {
 </html>`;
 	}
 
+	private getResourcePath(webviewEditor: vscode.WebviewEditor, resource: vscode.Uri) {
+		if (resource.scheme === 'data') {
+			return encodeURI(resource.toString(true));
+		}
+
+		return encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true));
+	}
+
 	private extensionResource(path: string) {
 		return this.webviewEditor.webview.asWebviewUri(this.extensionRoot.with({
 			path: this.extensionRoot.path + path
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -6,7 +6,8 @@
 import { coalesce, distinct } from 'vs/base/common/arrays';
 import * as glob from 'vs/base/common/glob';
 import { UnownedDisposable } from 'vs/base/common/lifecycle';
-import { basename } from 'vs/base/common/resources';
+import { Schemas } from 'vs/base/common/network';
+import { basename, DataUri } from 'vs/base/common/resources';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
@@ -16,7 +17,7 @@ import { IEditorOptions, ITextEditorOptions } from 'vs/platform/editor/common/ed
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { EditorOptions, IEditor, IEditorInput } from 'vs/workbench/common/editor';
+import { EditorInput, EditorOptions, IEditor, IEditorInput } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { webviewEditorsExtensionPoint } from 'vs/workbench/contrib/customEditor/browser/extensionPoint';
 import { CustomEditorDiscretion, CustomEditorInfo, CustomEditorSelector, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
@@ -203,25 +204,33 @@ export class CustomEditorContribution implements IWorkbenchContribution {
 		}
 
 		if (editor instanceof DiffEditorInput) {
-			if (editor.modifiedInput instanceof CustomFileEditorInput) {
-				return;
-			}
-			const resource = editor.modifiedInput.getResource();
-			if (!resource) {
-				return;
-			}
+			const getCustomEditorOverrideForSubInput = (subInput: IEditorInput): EditorInput | undefined => {
+				if (subInput instanceof CustomFileEditorInput) {
+					return undefined;
+				}
+				const resource = subInput.getResource();
+				if (!resource) {
+					return undefined;
+				}
 
-			const customEditors = distinct([
-				...this.customEditorService.getUserConfiguredCustomEditors(resource),
-				...this.customEditorService.getContributedCustomEditors(resource),
-			], editor => editor.id);
+				const editors = distinct([
+					...this.customEditorService.getUserConfiguredCustomEditors(resource),
+					...this.customEditorService.getContributedCustomEditors(resource),
+				], editor => editor.id);
 
-			// Always prefer the first editor in the diff editor case
-			if (customEditors.length > 0) {
+				// Always prefer the first editor in the diff editor case
+				return editors.length
+					? this.customEditorService.createInput(resource, editors[0].id, group)
+					: undefined;
+			};
+
+			const modifiedOverride = getCustomEditorOverrideForSubInput(editor.modifiedInput);
+			const originalOverride = getCustomEditorOverrideForSubInput(editor.originalInput);
+
+			if (modifiedOverride || originalOverride) {
 				return {
 					override: (async () => {
-						const newModified = this.customEditorService.createInput(resource, customEditors[0].id, group);
-						const input = new DiffEditorInput(editor.getName(), editor.getDescription(), editor.originalInput, newModified);
+						const input = new DiffEditorInput(editor.getName(), editor.getDescription(), originalOverride || editor.originalInput, modifiedOverride || editor.modifiedInput);
 						return this.editorService.openEditor(input, { ...options, ignoreOverrides: true }, group);
 					})(),
 				};
@@ -285,6 +294,15 @@ export class CustomEditorContribution implements IWorkbenchContribution {
 }
 
 function matches(selector: CustomEditorSelector, resource: URI): boolean {
+	if (resource.scheme === Schemas.data) {
+		const metadata = DataUri.parseMetaData(resource);
+		const mime = metadata.get(DataUri.META_DATA_MIME);
+		if (!selector.mime || !mime) {
+			return false;
+		}
+		return glob.match(selector.mime, mime.toLowerCase());
+	}
+
 	if (!selector.filenamePattern && !selector.scheme) {
 		return false;
 	}
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -31,6 +31,7 @@ export const enum CustomEditorDiscretion {
 export interface CustomEditorSelector {
 	readonly scheme?: string;
 	readonly filenamePattern?: string;
+	readonly mime?: string;
 }
 
 export interface CustomEditorInfo {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@`
`24`	`24`	`"displayName": "%webviewEditors.displayName%",`
`25`	`25`	`"selector": [`
`26`	`26`	`{`
`27`		`- "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,tga,tif,tiff,webp}"`
	`27`	`+ "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,tga,tif,tiff,webp}",`
	`28`	`+ "mime": "image/*"`
`28`	`29`	`}`
`29`	`30`	`]`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ export const enum CustomEditorDiscretion {`
`31`	`31`	`export interface CustomEditorSelector {`
`32`	`32`	`readonly scheme?: string;`
`33`	`33`	`readonly filenamePattern?: string;`
	`34`	`+ readonly mime?: string;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`export interface CustomEditorInfo {`