Skip to content

Commit ee3d28f

Browse files
aeschliaeschli
committed
[json] update dependencies, support schema-draft7
1 parent 1762c10 commit ee3d28f

7 files changed

Lines changed: 52 additions & 33 deletions

File tree

‎extensions/json-language-features/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"description": "%json.schemas.fileMatch.desc%"
6060
},
6161
"schema": {
62-
"$ref": "http://json-schema.org/draft-04/schema#",
62+
"$ref": "http://json-schema.org/draft-07/schema#",
6363
"description": "%json.schemas.schema.desc%"
6464
}
6565
}
@@ -101,8 +101,8 @@
101101
},
102102
"dependencies": {
103103
"vscode-extension-telemetry": "0.0.18",
104-
"vscode-languageclient": "^5.1.0-next.4",
105-
"vscode-nls": "^3.2.4"
104+
"vscode-languageclient": "^5.1.0-next.5",
105+
"vscode-nls": "^3.2.5"
106106
},
107107
"devDependencies": {
108108
"@types/node": "^8.10.25"

‎extensions/json-language-features/server/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
},
1313
"main": "./out/jsonServerMain",
1414
"dependencies": {
15-
"jsonc-parser": "^2.0.1",
15+
"jsonc-parser": "^2.0.2",
1616
"request-light": "^0.2.3",
17-
"vscode-json-languageservice": "^3.1.5",
17+
"vscode-json-languageservice": "^3.1.6",
1818
"vscode-languageserver": "^5.1.0-next.3",
19-
"vscode-nls": "^3.2.4",
20-
"vscode-uri": "^1.0.5"
19+
"vscode-nls": "^3.2.5",
20+
"vscode-uri": "^1.0.6"
2121
},
2222
"devDependencies": {
2323
"@types/mocha": "2.2.33",
@@ -35,4 +35,4 @@
3535
"install-server-local": "yarn link vscode-languageserver-server",
3636
"version": "git commit -m \"JSON Language Server $npm_package_version\" package.json"
3737
}
38-
}
38+
}

‎extensions/json-language-features/server/yarn.lock‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ jsonc-parser@^2.0.1:
5050
version "2.0.1"
5151
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.1.tgz#9d23cd2709714fff508a1a6679d82135bee1ae60"
5252

53+
jsonc-parser@^2.0.2:
54+
version "2.0.2"
55+
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d"
56+
5357
ms@2.0.0:
5458
version "2.0.0"
5559
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -62,14 +66,14 @@ request-light@^0.2.3:
6266
https-proxy-agent "^2.2.1"
6367
vscode-nls "^3.2.2"
6468

65-
vscode-json-languageservice@^3.1.5:
66-
version "3.1.5"
67-
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.5.tgz#4ebac4cadcaedd55ea2d0716259b50a89955e00e"
69+
vscode-json-languageservice@^3.1.6:
70+
version "3.1.6"
71+
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.6.tgz#272e21eb9abcefe6c1ed38be141f0a76d5ddf0cd"
6872
dependencies:
6973
jsonc-parser "^2.0.1"
70-
vscode-languageserver-types "^3.10.1"
74+
vscode-languageserver-types "^3.12.0"
7175
vscode-nls "^3.2.4"
72-
vscode-uri "^1.0.5"
76+
vscode-uri "^1.0.6"
7377

7478
vscode-jsonrpc@^3.6.2:
7579
version "3.6.2"
@@ -82,10 +86,6 @@ vscode-languageserver-protocol@^3.12.0:
8286
vscode-jsonrpc "^3.6.2"
8387
vscode-languageserver-types "^3.12.0"
8488

85-
vscode-languageserver-types@^3.10.1:
86-
version "3.10.1"
87-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.1.tgz#d5d5f44f688a3b2aa9857dc53cb9cacca73fe35a"
88-
8989
vscode-languageserver-types@^3.12.0:
9090
version "3.12.0"
9191
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:
101101
version "3.2.4"
102102
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
103103

104+
vscode-nls@^3.2.5:
105+
version "3.2.5"
106+
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
107+
104108
vscode-uri@^1.0.5:
105109
version "1.0.5"
106110
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"
111+
112+
vscode-uri@^1.0.6:
113+
version "1.0.6"
114+
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"

‎extensions/json-language-features/yarn.lock‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ semver@^5.3.0:
2828
version "5.5.0"
2929
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
3030

31+
semver@^5.5.0:
32+
version "5.5.1"
33+
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
34+
3135
vscode-extension-telemetry@0.0.18:
3236
version "0.0.18"
3337
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:
3842
version "3.6.2"
3943
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
4044

41-
vscode-languageclient@^5.1.0-next.4:
42-
version "5.1.0-next.4"
43-
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.4.tgz#2f96b4aa198c45f3e897b7f330c597a401ca95f2"
45+
vscode-languageclient@^5.1.0-next.5:
46+
version "5.1.0-next.5"
47+
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.5.tgz#bfe8750ea34eab6dbccbb12d0724c5a7d3fc1afd"
4448
dependencies:
45-
vscode-languageserver-protocol "^3.10.3"
49+
semver "^5.5.0"
50+
vscode-languageserver-protocol "^3.12.0"
4651

47-
vscode-languageserver-protocol@^3.10.3:
48-
version "3.10.3"
49-
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.10.3.tgz#59841c9602a6a6baab68613c2a47760994657196"
52+
vscode-languageserver-protocol@^3.12.0:
53+
version "3.12.0"
54+
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652"
5055
dependencies:
5156
vscode-jsonrpc "^3.6.2"
52-
vscode-languageserver-types "^3.10.1"
57+
vscode-languageserver-types "^3.12.0"
5358

54-
vscode-languageserver-types@^3.10.1:
55-
version "3.10.1"
56-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.1.tgz#d5d5f44f688a3b2aa9857dc53cb9cacca73fe35a"
59+
vscode-languageserver-types@^3.12.0:
60+
version "3.12.0"
61+
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
5762

58-
vscode-nls@^3.2.4:
59-
version "3.2.4"
60-
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
63+
vscode-nls@^3.2.5:
64+
version "3.2.5"
65+
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
6166

6267
zone.js@0.7.6:
6368
version "0.7.6"

‎extensions/json/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"jsonValidation": [
6666
{
6767
"fileMatch": "*.schema.json",
68-
"url": "http://json-schema.org/draft-04/schema#"
68+
"url": "http://json-schema.org/draft-07/schema#"
6969
}
7070
]
7171
}

‎src/vs/base/common/jsonSchema.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ export interface IJSONSchema {
4646
contains?: IJSONSchema;
4747
propertyNames?: IJSONSchema;
4848

49+
// schema draft 07
50+
$comment?: string;
51+
if?: IJSONSchema;
52+
then?: IJSONSchema;
53+
else?: IJSONSchema;
54+
4955
// VSCode extensions
5056
defaultSnippets?: IJSONSchemaSnippet[]; // VSCode extension
5157
errorMessage?: string; // VSCode extension

‎src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const configurationEntrySchema: IJSONSchema = {
2828
type: 'object',
2929
additionalProperties: {
3030
anyOf: [
31-
{ $ref: 'http://json-schema.org/draft-04/schema#' },
31+
{ $ref: 'http://json-schema.org/draft-07/schema#' },
3232
{
3333
type: 'object',
3434
properties: {

0 commit comments

Comments
 (0)