diff --git a/extensions/json/npm-shrinkwrap.json b/extensions/json/npm-shrinkwrap.json index b4c97acd780..c833ce05a34 100644 --- a/extensions/json/npm-shrinkwrap.json +++ b/extensions/json/npm-shrinkwrap.json @@ -13,19 +13,19 @@ "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.5.tgz" }, "vscode-jsonrpc": { - "version": "2.2.0", - "from": "vscode-jsonrpc@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-2.2.0.tgz" + "version": "2.3.2-next.5", + "from": "vscode-jsonrpc@>=2.3.2-next.2 <3.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-2.3.2-next.5.tgz" }, "vscode-languageclient": { - "version": "2.4.2-next.3", + "version": "2.4.2-next.21", "from": "vscode-languageclient@next", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-2.4.2-next.3.tgz" + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-2.4.2-next.21.tgz" }, "vscode-languageserver-types": { - "version": "1.0.1", - "from": "vscode-languageserver-types@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.1.tgz" + "version": "1.0.3", + "from": "vscode-languageserver-types@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.3.tgz" }, "vscode-nls": { "version": "1.0.7", diff --git a/extensions/json/package.json b/extensions/json/package.json index 973728f5472..78f4e0dbd96 100644 --- a/extensions/json/package.json +++ b/extensions/json/package.json @@ -98,7 +98,7 @@ }, "dependencies": { "vscode-extension-telemetry": "^0.0.5", - "vscode-languageclient": "^2.4.2-next.3", + "vscode-languageclient": "^2.4.2-next.21", "vscode-nls": "^1.0.7" } } diff --git a/extensions/json/server/npm-shrinkwrap.json b/extensions/json/server/npm-shrinkwrap.json index c926dd625c0..6ce6dfe75fc 100644 --- a/extensions/json/server/npm-shrinkwrap.json +++ b/extensions/json/server/npm-shrinkwrap.json @@ -43,29 +43,41 @@ "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.1.0.tgz" }, "vscode-json-languageservice": { - "version": "1.1.5-next.2", + "version": "1.1.8-next.1", "from": "vscode-json-languageservice@next", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-1.1.5-next.2.tgz" + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-1.1.8-next.1.tgz", + "dependencies": { + "vscode-languageserver-types": { + "version": "1.0.3", + "from": "vscode-languageserver-types@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.3.tgz" + } + } }, "vscode-jsonrpc": { - "version": "2.2.0", - "from": "vscode-jsonrpc@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-2.2.0.tgz" + "version": "2.3.2-next.5", + "from": "vscode-jsonrpc@>=2.3.2-next.2 <3.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-2.3.2-next.5.tgz" }, "vscode-languageserver": { - "version": "2.4.0-next.4", + "version": "2.4.0-next.12", "from": "vscode-languageserver@next", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-2.4.0-next.4.tgz" + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-2.4.0-next.12.tgz" }, "vscode-languageserver-types": { - "version": "1.0.1", - "from": "vscode-languageserver-types@1.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.1.tgz" + "version": "1.0.3", + "from": "vscode-languageserver-types@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.3.tgz" }, "vscode-nls": { "version": "1.0.7", "from": "vscode-nls@>=1.0.4 <2.0.0", "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz" + }, + "vscode-uri": { + "version": "0.0.6", + "from": "vscode-uri@>=0.0.6 <0.0.7", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-0.0.6.tgz" } } } diff --git a/extensions/json/server/package.json b/extensions/json/server/package.json index e1bb5f12973..8fa3aa27e34 100644 --- a/extensions/json/server/package.json +++ b/extensions/json/server/package.json @@ -9,8 +9,8 @@ }, "dependencies": { "request-light": "^0.1.0", - "vscode-json-languageservice": "^1.1.5-next.2", - "vscode-languageserver": "^2.4.0-next.4", + "vscode-json-languageservice": "^1.1.8-next.1", + "vscode-languageserver": "^2.4.0-next.12", "vscode-nls": "^1.0.4" }, "scripts": { diff --git a/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts b/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts index 381a8d1aec8..6a458db385c 100644 --- a/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts +++ b/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts @@ -219,10 +219,10 @@ export class ProjectJSONContribution implements JSONWorkerContribution { this.addCached(res.id, res.version, res.description); if (res.id === pack) { if (res.description) { - htmlContent.push({ language: 'string', value: res.description }); + htmlContent.push(MarkedString.fromPlainText(res.description)); } if (res.version) { - htmlContent.push({ language: 'string', value: localize('json.nugget.version.hover', 'Latest version: {0}', res.version)}); + htmlContent.push(MarkedString.fromPlainText(localize('json.nugget.version.hover', 'Latest version: {0}', res.version))); } break; }