development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 11:07:22 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

[json] update dependencies, support schema-draft7

Browse source
This commit is contained in:
Martin Aeschlimann 2018-08-27 17:21:13 +02:00
parent 1762c10b65
commit ee3d28f28a
7 changed files with 52 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/json-language-features/package.json
View file

@ -59,7 +59,7 @@
"description": "%json.schemas.fileMatch.desc%"
},
"schema": {
"$ref": "http://json-schema.org/draft-04/schema#",
"$ref": "http://json-schema.org/draft-07/schema#",
"description": "%json.schemas.schema.desc%"
}
}
@ -101,8 +101,8 @@
},
"dependencies": {
"vscode-extension-telemetry": "0.0.18",
"vscode-languageclient": "^5.1.0-next.4",
"vscode-nls": "^3.2.4"
"vscode-languageclient": "^5.1.0-next.5",
"vscode-nls": "^3.2.5"
},
"devDependencies": {
"@types/node": "^8.10.25"

10
extensions/json-language-features/server/package.json
View file

@ -12,12 +12,12 @@
},
"main": "./out/jsonServerMain",
"dependencies": {
"jsonc-parser": "^2.0.1",
"jsonc-parser": "^2.0.2",
"request-light": "^0.2.3",
"vscode-json-languageservice": "^3.1.5",
"vscode-json-languageservice": "^3.1.6",
"vscode-languageserver": "^5.1.0-next.3",
"vscode-nls": "^3.2.4",
"vscode-uri": "^1.0.5"
"vscode-nls": "^3.2.5",
"vscode-uri": "^1.0.6"
},
"devDependencies": {
"@types/mocha": "2.2.33",
@ -35,4 +35,4 @@
"install-server-local": "yarn link vscode-languageserver-server",
"version": "git commit -m \"JSON Language Server $npm_package_version\" package.json"
}
}
}

26
extensions/json-language-features/server/yarn.lock
View file

@ -50,6 +50,10 @@ jsonc-parser@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.1.tgz#9d23cd2709714fff508a1a6679d82135bee1ae60"
jsonc-parser@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d"
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@ -62,14 +66,14 @@ request-light@^0.2.3:
https-proxy-agent "^2.2.1"
vscode-nls "^3.2.2"
vscode-json-languageservice@^3.1.5:
version "3.1.5"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.5.tgz#4ebac4cadcaedd55ea2d0716259b50a89955e00e"
vscode-json-languageservice@^3.1.6:
version "3.1.6"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.6.tgz#272e21eb9abcefe6c1ed38be141f0a76d5ddf0cd"
dependencies:
jsonc-parser "^2.0.1"
vscode-languageserver-types "^3.10.1"
vscode-languageserver-types "^3.12.0"
vscode-nls "^3.2.4"
vscode-uri "^1.0.5"
vscode-uri "^1.0.6"
vscode-jsonrpc@^3.6.2:
version "3.6.2"
@ -82,10 +86,6 @@ vscode-languageserver-protocol@^3.12.0:
vscode-jsonrpc "^3.6.2"
vscode-languageserver-types "^3.12.0"
vscode-languageserver-types@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.1.tgz#d5d5f44f688a3b2aa9857dc53cb9cacca73fe35a"
vscode-languageserver-types@^3.12.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
@ -101,6 +101,14 @@ vscode-nls@^3.2.2, vscode-nls@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
vscode-nls@^3.2.5:
version "3.2.5"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
vscode-uri@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"
vscode-uri@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"

33
extensions/json-language-features/yarn.lock
View file

@ -28,6 +28,10 @@ semver@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
semver@^5.5.0:
version "5.5.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
vscode-extension-telemetry@0.0.18:
version "0.0.18"
resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
@ -38,26 +42,27 @@ vscode-jsonrpc@^3.6.2:
version "3.6.2"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
vscode-languageclient@^5.1.0-next.4:
version "5.1.0-next.4"
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.4.tgz#2f96b4aa198c45f3e897b7f330c597a401ca95f2"
vscode-languageclient@^5.1.0-next.5:
version "5.1.0-next.5"
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.5.tgz#bfe8750ea34eab6dbccbb12d0724c5a7d3fc1afd"
dependencies:
vscode-languageserver-protocol "^3.10.3"
semver "^5.5.0"
vscode-languageserver-protocol "^3.12.0"
vscode-languageserver-protocol@^3.10.3:
version "3.10.3"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.10.3.tgz#59841c9602a6a6baab68613c2a47760994657196"
vscode-languageserver-protocol@^3.12.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652"
dependencies:
vscode-jsonrpc "^3.6.2"
vscode-languageserver-types "^3.10.1"
vscode-languageserver-types "^3.12.0"
vscode-languageserver-types@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.1.tgz#d5d5f44f688a3b2aa9857dc53cb9cacca73fe35a"
vscode-languageserver-types@^3.12.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
vscode-nls@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
vscode-nls@^3.2.5:
version "3.2.5"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
zone.js@0.7.6:
version "0.7.6"

2
extensions/json/package.json
View file

@ -65,7 +65,7 @@
"jsonValidation": [
{
"fileMatch": "*.schema.json",
"url": "http://json-schema.org/draft-04/schema#"
"url": "http://json-schema.org/draft-07/schema#"
}
]
}

6
src/vs/base/common/jsonSchema.ts
View file

@ -46,6 +46,12 @@ export interface IJSONSchema {
contains?: IJSONSchema;
propertyNames?: IJSONSchema;
// schema draft 07
$comment?: string;
if?: IJSONSchema;
then?: IJSONSchema;
else?: IJSONSchema;
// VSCode extensions
defaultSnippets?: IJSONSchemaSnippet[]; // VSCode extension
errorMessage?: string; // VSCode extension

2
src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
View file

@ -28,7 +28,7 @@ const configurationEntrySchema: IJSONSchema = {
type: 'object',
additionalProperties: {
anyOf: [
{ $ref: 'http://json-schema.org/draft-04/schema#' },
{ $ref: 'http://json-schema.org/draft-07/schema#' },
{
type: 'object',
properties: {