diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json
index 64aeac42218..cda02f587b9 100644
--- a/extensions/html/server/npm-shrinkwrap.json
+++ b/extensions/html/server/npm-shrinkwrap.json
@@ -3,9 +3,9 @@
"version": "1.0.0",
"dependencies": {
"vscode-html-languageservice": {
- "version": "1.0.0-next.4",
+ "version": "1.0.0-next.5",
"from": "vscode-html-languageservice@next",
- "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-1.0.0-next.4.tgz"
+ "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-1.0.0-next.5.tgz"
},
"vscode-jsonrpc": {
"version": "2.4.0",
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index 24f4e6e6720..a6a02e95e00 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -8,7 +8,7 @@
"node": "*"
},
"dependencies": {
- "vscode-html-languageservice": "^1.0.0-next.4",
+ "vscode-html-languageservice": "^1.0.0-next.5",
"vscode-languageserver": "^2.6.0-next.3",
"vscode-nls": "^1.0.4"
},
diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts
index 7fd62633352..40c1cbe8746 100644
--- a/extensions/html/server/src/htmlServerMain.ts
+++ b/extensions/html/server/src/htmlServerMain.ts
@@ -6,8 +6,9 @@
import { createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult } from 'vscode-languageserver';
-import { HTMLDocument, getLanguageService, CompletionConfiguration, HTMLFormatConfiguration } from 'vscode-html-languageservice';
+import { HTMLDocument, getLanguageService, CompletionConfiguration, HTMLFormatConfiguration, DocumentContext } from 'vscode-html-languageservice';
import { getLanguageModelCache } from './languageModelCache';
+import * as url from 'url';
import * as nls from 'vscode-nls';
@@ -116,7 +117,8 @@ connection.onDocumentRangeFormatting(formatParams => {
connection.onDocumentLinks(documentLinkParam => {
let document = documents.get(documentLinkParam.textDocument.uri);
- return languageService.findDocumentLinks(document, workspacePath);
+ let documentContext: DocumentContext = { resolveReference: ref => url.resolve(document.uri, ref) };
+ return languageService.findDocumentLinks(document, documentContext);
});