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

Merge remote-tracking branch 'origin/master' into alex/tokenization

Browse Source
This commit is contained in:
Alex Dima
2017-01-09 11:19:26 +01:00
parent 8ba6bc5505 cf1412bbf6
commit 88c45c4e57
50 changed files with 800 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,9 +43,9 @@
"resolved": "https://registry.npmjs.org/request-light/-/request-light-0.1.0.tgz"
},
"vscode-json-languageservice": {
"version": "2.0.0-next.8",
"version": "2.0.0-next.9",
"from": "vscode-json-languageservice@next",
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.0-next.8.tgz"
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.0-next.9.tgz"
},
"vscode-jsonrpc": {
"version": "3.0.1-alpha.2",

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

@@ -9,7 +9,7 @@
},
"dependencies": {
"request-light": "^0.1.0",
"vscode-json-languageservice": "^2.0.0-next.8",
"vscode-json-languageservice": "^2.0.0-next.9",
"vscode-languageserver": "3.0.1-alpha.3",
"vscode-nls": "^1.0.7"
},