microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 02:01:43 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

[json] hover in JSON documents hides '*', fixes #8068

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-07-20 16:29:23 +02:00
parent 9b3d529474
commit 349c4ddf60
4 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/javascript/src/features/bowerJSONContribution.ts
View File

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

8
extensions/json/server/npm-shrinkwrap.json generated
View File

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

38
extensions/json/server/package.json
View File

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

4
extensions/json/server/src/jsoncontributions/projectJSONContribution.ts
View File

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