diff --git a/extensions/json/package.json b/extensions/json/package.json index c694c602671896a9a0a3bbdb2f8abd9d8f2f6b42..5762aeb39a1033768728af59fbf80e250d166d20 100644 --- a/extensions/json/package.json +++ b/extensions/json/package.json @@ -1,7 +1,7 @@ { "name": "json", "displayName": "%displayName%", - "description": "%description%", + "description": "%description%", "version": "1.0.0", "publisher": "vscode", "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", @@ -171,7 +171,7 @@ }, "dependencies": { "vscode-extension-telemetry": "0.0.15", - "vscode-languageclient": "4.0.0-next.9", + "vscode-languageclient": "^4.0.0", "vscode-nls": "^3.2.1" }, "devDependencies": { diff --git a/extensions/json/server/package.json b/extensions/json/server/package.json index c597f26e5cc00006253ab7a31fd527d81408176b..f19b70c2057ff7c9fc23caa1c38f2366261e85c6 100644 --- a/extensions/json/server/package.json +++ b/extensions/json/server/package.json @@ -8,10 +8,10 @@ "node": "*" }, "dependencies": { - "jsonc-parser": "^1.0.1", + "jsonc-parser": "^1.0.2", "request-light": "^0.2.2", - "vscode-json-languageservice": "^3.0.7", - "vscode-languageserver": "4.0.0-next.3", + "vscode-json-languageservice": "^3.0.8", + "vscode-languageserver": "^4.0.0", "vscode-nls": "^3.2.1", "vscode-uri": "^1.0.1" }, diff --git a/extensions/json/server/src/jsonServerMain.ts b/extensions/json/server/src/jsonServerMain.ts index 7e54ccec365b3b9b895b1d68a6a634cca51794ed..943201db631422b5bb13a0e4faf51e9195cead85 100644 --- a/extensions/json/server/src/jsonServerMain.ts +++ b/extensions/json/server/src/jsonServerMain.ts @@ -7,11 +7,9 @@ import { createConnection, IConnection, TextDocuments, TextDocument, InitializeParams, InitializeResult, NotificationType, RequestType, - DocumentRangeFormattingRequest, Disposable, ServerCapabilities + DocumentRangeFormattingRequest, Disposable, ServerCapabilities, DocumentColorRequest, ColorPresentationRequest, } from 'vscode-languageserver'; -import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities, ColorPresentationRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed'; - import { xhr, XHRResponse, configure as configureHttpRequests, getErrorStatusDescription } from 'request-light'; import fs = require('fs'); import URI from 'vscode-uri'; @@ -74,7 +72,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => { clientSnippetSupport = hasClientCapability('textDocument', 'completion', 'completionItem', 'snippetSupport'); clientDynamicRegisterSupport = hasClientCapability('workspace', 'symbol', 'dynamicRegistration'); - let capabilities: ServerCapabilities & CPServerCapabilities & FoldingProviderServerCapabilities = { + let capabilities: ServerCapabilities & FoldingProviderServerCapabilities = { // Tell the client that the server works in FULL text document sync mode textDocumentSync: documents.syncKind, completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: ['"', ':'] } : void 0, diff --git a/extensions/json/server/yarn.lock b/extensions/json/server/yarn.lock index ac7f8a50213b59015e4c68bed4a86e585ed7dad7..b8160cd0ac2fa00e13d0395b87b7c1183d48ab34 100644 --- a/extensions/json/server/yarn.lock +++ b/extensions/json/server/yarn.lock @@ -48,9 +48,9 @@ https-proxy-agent@2.1.1: agent-base "^4.1.0" debug "^3.1.0" -jsonc-parser@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.1.tgz#7f8f296414e6e7c4a33b9e4914fc8c47e4421675" +jsonc-parser@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.2.tgz#3fe86c0237db206fe5693872d93eec3bc3b05055" ms@2.0.0: version "2.0.0" @@ -64,35 +64,35 @@ request-light@^0.2.2: https-proxy-agent "2.1.1" vscode-nls "^2.0.2" -vscode-json-languageservice@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.0.7.tgz#dc00117d51d4a7ac3bde9204afa701f962f00736" +vscode-json-languageservice@^3.0.8: + version "3.0.8" + resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.0.8.tgz#0f585c2a0e75de224c89a4ee516bbf1be15699aa" dependencies: - jsonc-parser "^1.0.1" - vscode-languageserver-types "^3.6.0-next.1" - vscode-nls "^2.0.2" + jsonc-parser "^1.0.2" + vscode-languageserver-types "^3.6.0" + vscode-nls "^3.2.1" vscode-uri "^1.0.1" -vscode-jsonrpc@^3.6.0-next.1: - version "3.6.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe" +vscode-jsonrpc@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4" -vscode-languageserver-protocol@^3.6.0-next.3: - version "3.6.0-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.4.tgz#5b9940e4d6afafd5b63f9731dbd3a9bcc65b3719" +vscode-languageserver-protocol@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040" dependencies: - vscode-jsonrpc "^3.6.0-next.1" - vscode-languageserver-types "^3.6.0-next.1" + vscode-jsonrpc "^3.6.0" + vscode-languageserver-types "^3.6.0" -vscode-languageserver-types@^3.6.0-next.1: - version "3.6.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3" +vscode-languageserver-types@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz#0bba63b0fa82a714394a4478f55a596ee4ed7d0a" -vscode-languageserver@4.0.0-next.3: - version "4.0.0-next.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.0.0-next.3.tgz#89a9ce5078e3a86a78e3551c3766194ce4295611" +vscode-languageserver@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz#8b792f0d6d10acfe363d02371ed4ce53d08af88a" dependencies: - vscode-languageserver-protocol "^3.6.0-next.3" + vscode-languageserver-protocol "^3.6.0" vscode-uri "^1.0.1" vscode-nls@^2.0.2: diff --git a/extensions/json/yarn.lock b/extensions/json/yarn.lock index 926601edb29c8abd2e6d15aa99ccb5ab36ae7d01..e1a4ba1e6536ec866ae5dae1979a27283d00a67d 100644 --- a/extensions/json/yarn.lock +++ b/extensions/json/yarn.lock @@ -34,26 +34,26 @@ vscode-extension-telemetry@0.0.15: dependencies: applicationinsights "1.0.1" -vscode-jsonrpc@^3.6.0-next.1: - version "3.6.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe" +vscode-jsonrpc@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4" -vscode-languageclient@4.0.0-next.9: - version "4.0.0-next.9" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0-next.9.tgz#2a06568f46ee9de3490f85e227d3740a21a03d3a" +vscode-languageclient@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz#635f5bfbcfa1385dae489b394857f1db8b459a7d" dependencies: - vscode-languageserver-protocol "^3.6.0-next.5" + vscode-languageserver-protocol "^3.6.0" -vscode-languageserver-protocol@^3.6.0-next.5: - version "3.6.0-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3" +vscode-languageserver-protocol@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040" dependencies: - vscode-jsonrpc "^3.6.0-next.1" - vscode-languageserver-types "^3.6.0-next.1" + vscode-jsonrpc "^3.6.0" + vscode-languageserver-types "^3.6.0" -vscode-languageserver-types@^3.6.0-next.1: - version "3.6.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3" +vscode-languageserver-types@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz#0bba63b0fa82a714394a4478f55a596ee4ed7d0a" vscode-nls@^3.2.1: version "3.2.1"