From a271fa97a20d6c34d6fc4627b88ffbd214b0099c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 29 Aug 2017 16:13:09 -0700 Subject: [PATCH] Fix markdown.styles not resolving relative to root fixes #33455 --- extensions/markdown/src/previewContentProvider.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/markdown/src/previewContentProvider.ts b/extensions/markdown/src/previewContentProvider.ts index 4f0773e2692..f40078cce4a 100644 --- a/extensions/markdown/src/previewContentProvider.ts +++ b/extensions/markdown/src/previewContentProvider.ts @@ -153,14 +153,15 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv return vscode.Uri.file(href).toString(); } + const sourceUri = vscode.Uri.parse(resource.query); // use a workspace relative path if there is a workspace - let root = vscode.workspace.getWorkspaceFolder(resource); + let root = vscode.workspace.getWorkspaceFolder(sourceUri); if (root) { return vscode.Uri.file(path.join(root.uri.fsPath, href)).toString(); } // otherwise look relative to the markdown file - return vscode.Uri.file(path.join(path.dirname(resource.fsPath), href)).toString(); + return vscode.Uri.file(path.join(path.dirname(sourceUri.fsPath), href)).toString(); } private computeCustomStyleSheetIncludes(uri: vscode.Uri): string { -- GitLab