Fix markdown preview in serverless

mjbvz · mjbvz · commit a51205f59d0f · 2020-06-09T16:04:47.000-07:00
For microsoft#99717
diff --git a/extensions/markdown-language-features/src/features/previewContentProvider.ts b/extensions/markdown-language-features/src/features/previewContentProvider.ts
@@ -111,7 +111,7 @@ export class MarkdownContentProvider {
 
 	private extensionResourcePath(resourceProvider: WebviewResourceProvider, mediaFile: string): string {
 		const webviewResource = resourceProvider.asWebviewUri(
-			vscode.Uri.file(this.context.asAbsolutePath(path.join('media', mediaFile))));
+			vscode.Uri.joinPath(this.context.extensionUri, 'media', mediaFile));
 		return webviewResource.toString();
 	}
 
diff --git a/extensions/markdown-language-features/src/markdownExtensions.ts b/extensions/markdown-language-features/src/markdownExtensions.ts
@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import * as path from 'path';
-import { Disposable } from './util/dispose';
 import * as arrays from './util/arrays';
+import { Disposable } from './util/dispose';
 
 const resolveExtensionResource = (extension: vscode.Extension<any>, resourcePath: string): vscode.Uri => {
-	return vscode.Uri.file(path.join(extension.extensionPath, resourcePath));
+	return vscode.Uri.joinPath(extension.extensionUri, resourcePath);
 };
 
 const resolveExtensionResources = (extension: vscode.Extension<any>, resourcePaths: unknown): vscode.Uri[] => {
@@ -158,4 +157,4 @@ class VSCodeExtensionMarkdownContributionProvider extends Disposable implements
 
 export function getMarkdownExtensionContributions(context: vscode.ExtensionContext): MarkdownContributionProvider {
 	return new VSCodeExtensionMarkdownContributionProvider(context.extensionPath);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ export class MarkdownContentProvider {`
`111`	`111`
`112`	`112`	`private extensionResourcePath(resourceProvider: WebviewResourceProvider, mediaFile: string): string {`
`113`	`113`	`const webviewResource = resourceProvider.asWebviewUri(`
`114`		`- vscode.Uri.file(this.context.asAbsolutePath(path.join('media', mediaFile))));`
	`114`	`+ vscode.Uri.joinPath(this.context.extensionUri, 'media', mediaFile));`
`115`	`115`	`return webviewResource.toString();`
`116`	`116`	`}`
`117`	`117`