From a51205f59d0f8834bb45cfdd2d2bebae14f07df4 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Jun 2020 16:04:47 -0700 Subject: [PATCH] Fix markdown preview in serverless For #99717 --- .../src/features/previewContentProvider.ts | 2 +- .../markdown-language-features/src/markdownExtensions.ts | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/extensions/markdown-language-features/src/features/previewContentProvider.ts b/extensions/markdown-language-features/src/features/previewContentProvider.ts index 6e1f6dca9bb..0e723dffe4b 100644 --- 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 index b03c5df80bd..26d2e9e5907 100644 --- 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, 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, 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); -} \ No newline at end of file +}