diff --git a/extensions/javascript/src/features/bowerJSONContribution.ts b/extensions/javascript/src/features/bowerJSONContribution.ts index e43b0e69412..5355c5b71de 100644 --- a/extensions/javascript/src/features/bowerJSONContribution.ts +++ b/extensions/javascript/src/features/bowerJSONContribution.ts @@ -170,7 +170,7 @@ export class BowerJSONContribution implements IJSONContribution { htmlContent.push(localize('json.bower.package.hover', '{0}', pack)); return this.getInfo(pack).then(documentation => { if (documentation) { - htmlContent.push(documentation); + htmlContent.push({ language: 'string', value: documentation}); } return htmlContent; }); diff --git a/extensions/json/server/npm-shrinkwrap.json b/extensions/json/server/npm-shrinkwrap.json index fd9ac100aa8..d8baf3f485f 100644 --- a/extensions/json/server/npm-shrinkwrap.json +++ b/extensions/json/server/npm-shrinkwrap.json @@ -43,9 +43,8 @@ "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.1.0.tgz" }, "vscode-json-languageservice": { - "version": "1.1.2", - "from": "vscode-json-languageservice@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-1.1.2.tgz" + "version": "1.1.3-next.1", + "from": "vscode-json-languageservice@next" }, "vscode-jsonrpc": { "version": "2.2.0", @@ -59,8 +58,7 @@ }, "vscode-languageserver-types": { "version": "1.0.1", - "from": "vscode-languageserver-types@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.1.tgz" + "from": "vscode-languageserver-types@>=1.0.1 <2.0.0" }, "vscode-nls": { "version": "1.0.7", diff --git a/extensions/json/server/package.json b/extensions/json/server/package.json index 5420a768695..9363f813531 100644 --- a/extensions/json/server/package.json +++ b/extensions/json/server/package.json @@ -1,20 +1,20 @@ { - "name": "vscode-json-server", - "description": "JSON language server", - "version": "0.0.1", - "author": "Microsoft Corporation", - "license": "MIT", - "engines": { - "node": "*" - }, - "dependencies": { - "request-light": "^0.1.0", - "vscode-json-languageservice": "^1.1.1", - "vscode-languageserver": "^2.2.0", - "vscode-nls": "^1.0.4" - }, - "scripts": { - "compile": "gulp compile-extension:json-server", - "watch": "gulp watch-extension:json-server" - } -} \ No newline at end of file + "name": "vscode-json-server", + "description": "JSON language server", + "version": "0.0.1", + "author": "Microsoft Corporation", + "license": "MIT", + "engines": { + "node": "*" + }, + "dependencies": { + "request-light": "^0.1.0", + "vscode-json-languageservice": "^1.1.3-next.1", + "vscode-languageserver": "^2.2.0", + "vscode-nls": "^1.0.4" + }, + "scripts": { + "compile": "gulp compile-extension:json-server", + "watch": "gulp watch-extension:json-server" + } +} diff --git a/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts b/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts index 887ac07354c..7c7ccb2eebd 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(res.description); + htmlContent.push({ language: 'string', value: res.description }); } if (res.version) { - htmlContent.push(localize('json.nugget.version.hover', 'Latest version: {0}', res.version)); + htmlContent.push({ language: 'string', value: localize('json.nugget.version.hover', 'Latest version: {0}', res.version)}); } break; }