From bfc4e3d780ddbcf8802d9ddc61e3b440af3cae5b Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Wed, 19 Apr 2017 19:38:32 +0200 Subject: [PATCH] [html] support for base url. Fixes #20729 --- extensions/html/server/src/htmlServerMain.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts index ca60a7b8ddf..7c1f292fa02 100644 --- a/extensions/html/server/src/htmlServerMain.ts +++ b/extensions/html/server/src/htmlServerMain.ts @@ -254,12 +254,16 @@ connection.onDocumentRangeFormatting(formatParams => { connection.onDocumentLinks(documentLinkParam => { let document = documents.get(documentLinkParam.textDocument.uri); let documentContext: DocumentContext = { - resolveReference: ref => { + resolveReference: (ref, base) => { + if (base) { + ref = url.resolve(base, ref); + } if (workspacePath && ref[0] === '/') { return uri.file(path.join(workspacePath, ref)).toString(); } return url.resolve(document.uri, ref); - } + }, + }; let links: DocumentLink[] = []; languageModes.getAllModesInDocument(document).forEach(m => {