Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

src/vs/platform/webview/common/mimeTypes.ts

@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getMediaMime, MIME_UNKNOWN } from 'vs/base/common/mime';
+import { extname } from 'vs/base/common/path';
+import { URI } from 'vs/base/common/uri';
+
+const webviewMimeTypes = new Map([
+	['.svg', 'image/svg+xml'],
+	['.txt', 'text/plain'],
+	['.css', 'text/css'],
+	['.js', 'application/javascript'],
+	['.json', 'application/json'],
+	['.html', 'text/html'],
+	['.htm', 'text/html'],
+	['.xhtml', 'application/xhtml+xml'],
+	['.oft', 'font/otf'],
+	['.xml', 'application/xml'],
+]);
+
+export function getWebviewContentMimeType(resource: URI): string {
+	const ext = extname(resource.fsPath).toLowerCase();
+	return webviewMimeTypes.get(ext) || getMediaMime(resource.fsPath) || MIME_UNKNOWN;
+}

src/vs/platform/webview/common/resourceLoader.ts

@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
+import { isUNC } from 'vs/base/common/extpath';
+import { Schemas } from 'vs/base/common/network';
+import { sep } from 'vs/base/common/path';
+import { URI } from 'vs/base/common/uri';
+import { IFileService } from 'vs/platform/files/common/files';
+import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
+import { getWebviewContentMimeType } from 'vs/platform/webview/common/mimeTypes';
+
+export namespace WebviewResourceResponse {
+	export enum Type { Success, Failed, AccessDenied }
+
+	export class StreamSuccess {
+		readonly type = Type.Success;
+
+		constructor(
+			public readonly stream: VSBufferReadableStream,
+			public readonly mimeType: string
+		) { }
+	}
+
+	export class BufferSuccess {
+		readonly type = Type.Success;
+
+		constructor(
+			public readonly buffer: VSBuffer,
+			public readonly mimeType: string
+		) { }
+	}
+
+	export const Failed = { type: Type.Failed } as const;
+	export const AccessDenied = { type: Type.AccessDenied } as const;
+
+	export type BufferResponse = BufferSuccess | typeof Failed | typeof AccessDenied;
+	export type StreamResponse = StreamSuccess | typeof Failed | typeof AccessDenied;
+}
+
+export async function loadLocalResource(
+	requestUri: URI,
+	fileService: IFileService,
+	extensionLocation: URI | undefined,
+	roots: ReadonlyArray<URI>
+): Promise<WebviewResourceResponse.BufferResponse> {
+	const resourceToLoad = getResourceToLoad(requestUri, extensionLocation, roots);
+	if (!resourceToLoad) {
+		return WebviewResourceResponse.AccessDenied;
+	}
+
+	try {
+		const data = await fileService.readFile(resourceToLoad);
+		const mime = getWebviewContentMimeType(requestUri); // Use the original path for the mime
+		return new WebviewResourceResponse.BufferSuccess(data.value, mime);
+	} catch (err) {
+		console.log(err);
+		return WebviewResourceResponse.Failed;
+	}
+}
+
+export async function loadLocalResourceStream(
+	requestUri: URI,
+	fileService: IFileService,
+	extensionLocation: URI | undefined,
+	roots: ReadonlyArray<URI>
+): Promise<WebviewResourceResponse.StreamResponse> {
+	const resourceToLoad = getResourceToLoad(requestUri, extensionLocation, roots);
+	if (!resourceToLoad) {
+		return WebviewResourceResponse.AccessDenied;
+	}
+
+	try {
+		const contents = await fileService.readFileStream(resourceToLoad);
+		const mime = getWebviewContentMimeType(requestUri); // Use the original path for the mime
+		return new WebviewResourceResponse.StreamSuccess(contents.value, mime);
+	} catch (err) {
+		console.log(err);
+		return WebviewResourceResponse.Failed;
+	}
+}
+
+function getResourceToLoad(
+	requestUri: URI,
+	extensionLocation: URI | undefined,
+	roots: ReadonlyArray<URI>
+): URI | undefined {
+	const normalizedPath = normalizeRequestPath(requestUri);
+
+	for (const root of roots) {
+		if (!containsResource(root, normalizedPath)) {
+			continue;
+		}
+
+		if (extensionLocation && extensionLocation.scheme === REMOTE_HOST_SCHEME) {
+			return URI.from({
+				scheme: REMOTE_HOST_SCHEME,
+				authority: extensionLocation.authority,
+				path: '/vscode-resource',
+				query: JSON.stringify({
+					requestResourcePath: normalizedPath.path
+				})
+			});
+		} else {
+			return normalizedPath;
+		}
+	}
+
+	return undefined;
+}
+
+function normalizeRequestPath(requestUri: URI) {
+	if (requestUri.scheme !== Schemas.vscodeWebviewResource) {
+		return requestUri;
+	}
+
+	// The `vscode-webview-resource` scheme has the following format:
+	//
+	// vscode-webview-resource://id/scheme//authority?/path
+	//
+	const resourceUri = URI.parse(requestUri.path.replace(/^\/([a-z0-9\-]+)\/{1,2}/i, '$1://'));
+
+	return resourceUri.with({
+		query: requestUri.query,
+		fragment: requestUri.fragment
+	});
+}
+
+function containsResource(root: URI, resource: URI): boolean {
+	let rootPath = root.fsPath + (root.fsPath.endsWith(sep) ? '' : sep);
+	let resourceFsPath = resource.fsPath;
+
+	if (isUNC(root.fsPath) && isUNC(resource.fsPath)) {
+		rootPath = rootPath.toLowerCase();
+		resourceFsPath = resourceFsPath.toLowerCase();
+	}
+
+	return resourceFsPath.startsWith(rootPath);
+}

src/vs/platform/webview/common/webviewManagerService.ts

@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { UriComponents } from 'vs/base/common/uri';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const IWebviewManagerService = createDecorator<IWebviewManagerService>('webviewManagerService');
+
+export interface IWebviewManagerService {
+	_serviceBrand: unknown;
+
+	registerWebview(id: string, metadata: RegisterWebviewMetadata): Promise<void>;
+	unregisterWebview(id: string): Promise<void>;
+	updateLocalResourceRoots(id: string, roots: UriComponents[]): Promise<void>;
+
+	setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): Promise<void>;
+}
+
+export interface RegisterWebviewMetadata {
+	readonly extensionLocation: UriComponents | undefined;
+	readonly localResourceRoots: readonly UriComponents[];
+}