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

[json] add multiroot support. Fixes #32487

Browse Source
This commit is contained in:
Martin Aeschlimann
2017-08-23 14:04:34 +02:00
parent 00a44d37c5
commit b14c255400
7 changed files with 110 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,9 +28,9 @@
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz"
},
"jsonc-parser": {
"version": "0.4.2",
"from": "jsonc-parser@0.4.2",
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.4.2.tgz"
"version": "1.0.0",
"from": "jsonc-parser@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-1.0.0.tgz"
},
"ms": {
"version": "0.7.3",
@@ -43,24 +43,24 @@
"resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.1.tgz"
},
"vscode-json-languageservice": {
"version": "2.0.13",
"version": "2.0.14",
"from": "vscode-json-languageservice@next",
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.13.tgz"
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.14.tgz"
},
"vscode-jsonrpc": {
"version": "3.1.0-alpha.1",
"from": "vscode-jsonrpc@>=3.1.0-alpha.1 <4.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.1.0-alpha.1.tgz"
"version": "3.3.1",
"from": "vscode-jsonrpc@>=3.3.0 <4.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"
},
"vscode-languageserver": {
"version": "3.1.0-alpha.1",
"version": "3.4.0-next.4",
"from": "vscode-languageserver@next",
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.1.0-alpha.1.tgz"
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.0-next.4.tgz"
},
"vscode-languageserver-types": {
"version": "3.0.3",
"version": "3.3.0",
"from": "vscode-languageserver-types@>=3.0.3 <4.0.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.3.tgz"
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz"
},
"vscode-nls": {
"version": "2.0.2",

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

@@ -8,10 +8,10 @@
"node": "*"
},
"dependencies": {
"jsonc-parser": "^0.4.2",
"jsonc-parser": "^1.0.0",
"request-light": "^0.2.1",
"vscode-json-languageservice": "^2.0.13",
"vscode-languageserver": "^3.1.0-alpha.1",
"vscode-json-languageservice": "^2.0.14",
"vscode-languageserver": "^3.4.0-next.4",
"vscode-nls": "^2.0.2"
},
"devDependencies": {

2
extensions/json/server/src/jsonServerMain.ts
View File

@@ -161,11 +161,9 @@ connection.onDidChangeConfiguration((change) => {
let enableFormatter = settings && settings.json && settings.json.format && settings.json.format.enable;
if (enableFormatter) {
if (!formatterRegistration) {
console.log('enable');
formatterRegistration = connection.client.register(DocumentRangeFormattingRequest.type, { documentSelector: [{ language: 'json' }] });
}
} else if (formatterRegistration) {
console.log('enable');
formatterRegistration.then(r => r.dispose());
formatterRegistration = null;
}