Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[html] update languageservice. Fixes #12954

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-10-11 11:48:03 +02:00
parent a0f68bfe3f
commit 07bbf8bb4e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/html/server/npm-shrinkwrap.json generated
View File

@@ -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",

2
extensions/html/server/package.json
View File

@@ -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"
},

6
extensions/html/server/src/htmlServerMain.ts
View File

@@ -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);
});