From f3ebdf5b92703db60523eeeecc775b02d5ca1a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Tue, 21 Jan 2020 14:17:43 +0100 Subject: [PATCH 1/3] Update Language Client to 6.0.0 #196 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - requires upgrade of TtypeScript to 3.7.5 to avoid "error TS1086: An accessor cannot be declared in an ambient context. " - requires API updates: -- client/src/monaco-language-client.ts createMessageTransports now using Promise instead of Thenable -- vscode-uri Uri has been renamed URI -- registerCallHierarchyProvider has moved from workspace to languages remaining: monaco-languageclient: src/vscode-api.ts(52,11): error TS2740: Type '{ createFileSystemWatcher(globPattern: GlobPattern, ignoreCreateEvents: boolean | undefined, ignoreChangeEvents: boolean | undefined, ignoreDeleteEvents: boolean | undefined): FileSystemWatcher; ... 21 more ...; name: undefined; }' is missing the following properties from type 'typeof workspace': fs, workspaceFile, onWillCreateFiles, onDidCreateFiles, and 4 more. monaco-languageclient: src/vscode-api.ts(209,17): error TS2322: Type '(arg0: Uri, arg1: readonly Diagnostic[] | undefined) => void' is not assignable to type '{ (uri: Uri, diagnostics: readonly Diagnostic[] | undefined): void; (entries: readonly [Uri, readonly Diagnostic[] | undefined][]): void; }'. Signed-off-by: Aurélien Pupier --- client/package.json | 10 +-- client/src/monaco-language-client.ts | 2 +- client/src/services.ts | 10 +-- client/src/vscode-api.ts | 12 ++-- example/package.json | 2 +- package.json | 6 +- yarn.lock | 94 +++++++++++++++------------- 7 files changed, 73 insertions(+), 63 deletions(-) diff --git a/client/package.json b/client/package.json index d8ca7964e..b9624a0aa 100644 --- a/client/package.json +++ b/client/package.json @@ -5,7 +5,7 @@ "author": "TypeFox GmbH (http://www.typefox.io)", "license": "MIT", "engines": { - "vscode": "^1.33.0" + "vscode": "^1.41.0" }, "repository": { "type": "git", @@ -17,10 +17,10 @@ "main": "./lib/index.js", "typings": "./lib/index", "dependencies": { - "glob-to-regexp": "^0.3.0", - "vscode-jsonrpc": "^4.1.0-next", - "vscode-languageclient": "^5.3.0-next", - "vscode-uri": "^1.0.5" + "glob-to-regexp": "^0.4.1", + "vscode-jsonrpc": "^5.0.0", + "vscode-languageclient": "^6.0.0", + "vscode-uri": "^2.1.1" }, "scripts": { "prepare": "yarn run clean && yarn run compile", diff --git a/client/src/monaco-language-client.ts b/client/src/monaco-language-client.ts index 76205d545..7e58f750b 100644 --- a/client/src/monaco-language-client.ts +++ b/client/src/monaco-language-client.ts @@ -79,7 +79,7 @@ export class MonacoLanguageClient extends BaseLanguageClient { return this.connectionProvider.get(errorHandler, closeHandler, this.outputChannel); } - protected createMessageTransports(encoding: string): Thenable { + protected createMessageTransports(encoding: string): Promise { throw new Error('Unsupported'); } diff --git a/client/src/services.ts b/client/src/services.ts index d807ad041..f4257c0b4 100644 --- a/client/src/services.ts +++ b/client/src/services.ts @@ -22,7 +22,7 @@ import { Disposable, CancellationToken, Event, Emitter } from 'vscode-jsonrpc'; -import Uri from 'vscode-uri'; +import { URI } from 'vscode-uri'; export { Disposable, CancellationToken, Event, Emitter @@ -64,7 +64,7 @@ export function isDocumentSelector(selector: any): selector is DocumentSelector } export interface DiagnosticCollection extends Disposable { - set(uri: string, diagnostics: Diagnostic[]): void; + set(uri: string, diagnostics: readonly Diagnostic[]): void; } export type ProviderResult = T | undefined | null | PromiseLike; @@ -234,9 +234,9 @@ export interface WorkspaceConfiguration { } export interface FileSystemWatcher extends Disposable { - readonly onDidCreate: Event; - readonly onDidChange: Event; - readonly onDidDelete: Event; + readonly onDidCreate: Event; + readonly onDidChange: Event; + readonly onDidDelete: Event; } export interface ConfigurationChangeEvent { diff --git a/client/src/vscode-api.ts b/client/src/vscode-api.ts index 36fe54ca8..5b852cfeb 100644 --- a/client/src/vscode-api.ts +++ b/client/src/vscode-api.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import * as vscode from "vscode"; -import URI from "vscode-uri" +import { URI } from "vscode-uri" import { Disposable } from "./disposable"; import { Services, Event, Diagnostic, WorkspaceEdit, isDocumentSelector, @@ -185,7 +185,8 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc registerTaskProvider: unsupported, registerFileSystemProvider: unsupported, rootPath: undefined, - name: undefined + name: undefined, + }; const languages: typeof vscode.languages = { match(selector, document): number { @@ -205,10 +206,10 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc services.languages.createDiagnosticCollection(name) : undefined; return { name: name || 'default', - set(arg0: vscode.Uri | [vscode.Uri, vscode.Diagnostic[] | undefined][], arg1?: vscode.Diagnostic[] | undefined): void { + set(arg0: vscode.Uri, arg1: readonly vscode.Diagnostic[] | undefined): void { if (collection) { if (arg1) { - collection.set(arg0.toString(), arg1 as Diagnostic[]); + collection.set(arg0.toString(), arg1 as readonly Diagnostic[]); } else { collection.set(arg0.toString(), []); } @@ -551,7 +552,8 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc setTextDocumentLanguage: unsupported, getDiagnostics: unsupported, setLanguageConfiguration: unsupported, - onDidChangeDiagnostics: unsupported + onDidChangeDiagnostics: unsupported, + registerCallHierarchyProvider: unsupported }; function showMessage(type: MessageType, arg0: any, ...arg1: any[]): Thenable { if (typeof arg0 !== "string") { diff --git a/example/package.json b/example/package.json index bac21a0dd..a3643cf75 100644 --- a/example/package.json +++ b/example/package.json @@ -10,7 +10,7 @@ "reconnecting-websocket": "^3.2.2", "request-light": "^0.2.2", "vscode-json-languageservice": "^3.3.1", - "vscode-languageserver": "^5.3.0-next", + "vscode-languageserver": "^6.0.0", "vscode-ws-jsonrpc": "^0.1.1", "ws": "^5.0.0" }, diff --git a/package.json b/package.json index 7fc854b63..ac1ef8157 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,17 @@ "private": true, "devDependencies": { "@types/express": "^4.0.35", - "@types/node": "^7.0.12", + "@types/node": "^13.1.7", "@types/normalize-url": "^1.9.1", "@types/ws": "0.0.39", - "@types/vscode": "1.33.0", + "@types/vscode": "1.41.0", "css-loader": "^0.28.11", "lerna": "^3.16.4", "monaco-editor-core": "^0.18.1", "rimraf": "^2.6.2", "source-map-loader": "^0.2.3", "style-loader": "^0.20.3", - "typescript": "^3.0.1", + "typescript": "^3.7.5", "uglifyjs-webpack-plugin": "^1.2.4", "webpack": "^3.11.0", "webpack-merge": "^4.1.2" diff --git a/yarn.lock b/yarn.lock index e7670f411..ef87cadbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -881,10 +881,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.1.tgz#3b5c3a26393c19b400844ac422bd0f631a94d69d" integrity sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw== -"@types/node@^7.0.12": - version "7.10.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.10.7.tgz#8604623912010235185f1166c7a5a9aa7de9fcd8" - integrity sha512-4I7+hXKyq7e1deuzX9udu0hPIYqSSkdKXtjow6fMnQ3OR9qkxIErGHbGY08YrfZJrCS1ajK8lOuzd0k3n2WM4A== +"@types/node@^13.1.7": + version "13.1.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.7.tgz#db51d28b8dfacfe4fb2d0da88f5eb0a2eca00675" + integrity sha512-HU0q9GXazqiKwviVxg9SI/+t/nAsGkvLDkIdxz+ObejG2nX6Si00TeLqHMoS+a/1tjH7a8YpKVQwtgHuMQsldg== "@types/normalize-url@^1.9.1": version "1.9.1" @@ -904,10 +904,10 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" -"@types/vscode@1.33.0": - version "1.33.0" - resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.33.0.tgz#da400abcb4caaeea18fd37287a3f48b18c785c94" - integrity sha512-JSmGiValbrcG5g20jjCfKakLiuWyrcjVezj+SEAEZ4klXQktE5EtowuGlkLVqbkiBK4iY5wy/4yW8OjecuHnjQ== +"@types/vscode@1.41.0": + version "1.41.0" + resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.41.0.tgz#b0d75920220f84e07093285e59180c0f11d336cd" + integrity sha512-7SfeY5u9jgiELwxyLB3z7l6l/GbN9CqpCQGkcRlB7tKRFBxzbz2PoBfGrLxI1vRfUCIq5+hg5vtDHExwq5j3+A== "@types/ws@0.0.39": version "0.0.39" @@ -3151,6 +3151,11 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.1.4" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" @@ -6103,7 +6108,7 @@ schema-utils@^0.4.5: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== -semver@^6.0.0, semver@^6.2.0: +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -6801,10 +6806,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.0.1: - version "3.5.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977" - integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g== +typescript@^3.7.5: + version "3.7.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" + integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== uglify-es@^3.3.4: version "3.3.9" @@ -7049,61 +7054,64 @@ vscode-json-languageservice@^3.3.1: vscode-nls "^4.1.1" vscode-uri "^2.0.3" -vscode-jsonrpc@^4.1.0-next, vscode-jsonrpc@^4.1.0-next.2: +vscode-jsonrpc@^4.1.0-next: version "4.1.0-next.2" resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.2.tgz#3bd318910a48e631742b290975386e3dae685be3" integrity sha512-GsBLjP9DxQ42yl1mW9GEIlnSc0+R8mfzhaebwmmTPEJjezD5SPoAo3DFrIAFZha9yvQ1nzZfZlhtVpGQmgxtXg== -vscode-languageclient@^5.3.0-next: - version "5.3.0-next.6" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.3.0-next.6.tgz#35e74882781158e8b111911c0953869d3df08777" - integrity sha512-DxT8+gkenjCjJV6ArcP75/AQfx6HP6m6kHIbacPCpffMeoE1YMLKj6ZixA9J87yr0fMtBmqumLmDeGe7MIF2bw== +vscode-jsonrpc@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0.tgz#445be9fb404e2793a91b9c0cef3c52dec3e02b89" + integrity sha512-QeAniC/xTWauVQgyNgEqNJ0Qm/Jw8QySGRQhRFPwb8c4FPp9k6QNgJp0ayXWws5qhdaHkiXkGPlzjOPZFQQKLw== + +vscode-languageclient@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.0.0.tgz#777a90ca399c4a4d942b3012c0ad2ec47409c4e5" + integrity sha512-6MDksAP79GRbcHFsXS6ndo12s0m/h7eNdS/IanRgWxaezqB4a4KzHIHrE0bE+nSFB+snaSToGs1bxnPeKdO5fQ== dependencies: - semver "^5.5.0" - vscode-languageserver-protocol "^3.15.0-next.6" + semver "^6.3.0" + vscode-languageserver-protocol "^3.15.0" -vscode-languageserver-protocol@^3.15.0-next.6: - version "3.15.0-next.6" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz#a8aeb7e7dd65da8216b386db59494cdfd3215d92" - integrity sha512-/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ== +vscode-languageserver-protocol@^3.15.0: + version "3.15.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0.tgz#7f306dc337a72e4d84882bd952db51e084fef8fe" + integrity sha512-PZEopQzHR3Lo422HeDxCpGN0sYz+kReO+du3F/AcFT1cCPunoVsDJv7ikEolFRKEn+hEIZiAaIX4yoSZ+ip5Nw== dependencies: - vscode-jsonrpc "^4.1.0-next.2" - vscode-languageserver-types "^3.15.0-next.2" + vscode-jsonrpc "^5.0.0" + vscode-languageserver-types "3.15.0" + +vscode-languageserver-types@3.15.0: + version "3.15.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0.tgz#c45a23308ec0967135c483b759dfaf97978d9e0a" + integrity sha512-AXteNagMhBWnZ6gNN0UB4HTiD/7TajgfHl6jaM6O7qz3zDJw0H3Jf83w05phihnBRCML+K6Ockh8f8bL0OObPw== vscode-languageserver-types@^3.15.0-next, vscode-languageserver-types@^3.15.0-next.2: version "3.15.0-next.2" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.2.tgz#a0601332cdaafac21931f497bb080cfb8d73f254" integrity sha512-2JkrMWWUi2rlVLSo9OFR2PIGUzdiowEM8NgNYiwLKnXTjpwpjjIrJbNNxDik7Rv4oo9KtikcFQZKXbrKilL/MQ== -vscode-languageserver@^5.3.0-next: - version "5.3.0-next.8" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.3.0-next.8.tgz#12a4adf60374dbb93e153e08bdca5525f9b2029f" - integrity sha512-6vUb96wsRfrFqndril3gct/FBCSc24OxFZ2iz7kuEuXvLaIcEVOcSZIqQK8oFN7PdbAIaa9nnIpKSy4Yd15cIw== +vscode-languageserver@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-6.0.0.tgz#4b6fa593422a68bab3c5e92f1d50af3a7cb770f8" + integrity sha512-QihKytod/PApM+wU9qmjxjGT+p4vYDJCbMcdwol55QeE80DCMyls6yxJzTn8SNCNpP4JZin8SIZp1zpumfktQg== dependencies: - vscode-languageserver-protocol "^3.15.0-next.6" - vscode-textbuffer "^1.0.0" - vscode-uri "^1.0.6" + vscode-languageserver-protocol "^3.15.0" vscode-nls@^4.0.0, vscode-nls@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c" integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A== -vscode-textbuffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vscode-textbuffer/-/vscode-textbuffer-1.0.0.tgz#1faee638c8e0e4131c8d5c353993a1874acda086" - integrity sha512-zPaHo4urgpwsm+PrJWfNakolRpryNja18SUip/qIIsfhuEqEIPEXMxHOlFPjvDC4JgTaimkncNW7UMXRJTY6ow== - -vscode-uri@^1.0.5, vscode-uri@^1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" - integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== - vscode-uri@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.3.tgz#25e5f37f552fbee3cec7e5f80cef8469cefc6543" integrity sha512-4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw== +vscode-uri@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.1.tgz#5aa1803391b6ebdd17d047f51365cf62c38f6e90" + integrity sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A== + vscode-ws-jsonrpc@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.1.1.tgz#163ff05662635b4fd161ed132e112cec4d83f126" From b5e0e8c7fbf9ebc4432b2a298fb1500aa09aa2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Tue, 21 Jan 2020 14:31:12 +0100 Subject: [PATCH 2/3] Fix compilation issue for createFileSystemWatcher #196 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit monaco-languageclient: src/vscode-api.ts(52,11): error TS2740: Type '{ createFileSystemWatcher(globPattern: GlobPattern, ignoreCreateEvents: boolean | undefined, ignoreChangeEvents: boolean | undefined, ignoreDeleteEvents: boolean | undefined): FileSystemWatcher; ... 21 more ...; name: undefined; }' is missing the following properties from type 'typeof workspace': fs, workspaceFile, onWillCreateFiles, onDidCreateFiles, and 4 more. Signed-off-by: Aurélien Pupier --- client/src/vscode-api.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/client/src/vscode-api.ts b/client/src/vscode-api.ts index 5b852cfeb..df853e736 100644 --- a/client/src/vscode-api.ts +++ b/client/src/vscode-api.ts @@ -186,6 +186,14 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc registerFileSystemProvider: unsupported, rootPath: undefined, name: undefined, + fs: vscode.workspace.fs, + workspaceFile: undefined, + onWillCreateFiles: unsupported, + onWillDeleteFiles: unsupported, + onDidCreateFiles: unsupported, + onDidDeleteFiles: unsupported, + onDidRenameFiles: unsupported, + onWillRenameFiles: unsupported }; const languages: typeof vscode.languages = { From ea0dc8780ccfc4a2120f0280d7e92225c4da190d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Tue, 21 Jan 2020 18:08:23 +0100 Subject: [PATCH 3/3] Fix some compilation issues in json-servers #196 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Pupier --- client/package.json | 2 +- example/package.json | 1 + example/src/json-server.ts | 5 +++-- yarn.lock | 28 +++++++++++++++++++++++----- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/client/package.json b/client/package.json index b9624a0aa..972562555 100644 --- a/client/package.json +++ b/client/package.json @@ -19,7 +19,7 @@ "dependencies": { "glob-to-regexp": "^0.4.1", "vscode-jsonrpc": "^5.0.0", - "vscode-languageclient": "^6.0.0", + "vscode-languageclient": "^6.0.1", "vscode-uri": "^2.1.1" }, "scripts": { diff --git a/example/package.json b/example/package.json index a3643cf75..1537c8af5 100644 --- a/example/package.json +++ b/example/package.json @@ -9,6 +9,7 @@ "normalize-url": "^2.0.1", "reconnecting-websocket": "^3.2.2", "request-light": "^0.2.2", + "vscode-languageserver-textdocument": "^1.0.0", "vscode-json-languageservice": "^3.3.1", "vscode-languageserver": "^6.0.0", "vscode-ws-jsonrpc": "^0.1.1", diff --git a/example/src/json-server.ts b/example/src/json-server.ts index 6bdcb2d94..87cd6ed8e 100644 --- a/example/src/json-server.ts +++ b/example/src/json-server.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import * as fs from "fs"; import { xhr, getErrorStatusDescription } from 'request-light'; -import URI from 'vscode-uri'; +import { URI } from 'vscode-uri'; import { MessageReader, MessageWriter } from "vscode-jsonrpc"; import { IConnection, TextDocuments, createConnection } from 'vscode-languageserver'; import { @@ -13,6 +13,7 @@ import { } from "vscode-languageserver-types"; import { TextDocumentPositionParams, DocumentRangeFormattingParams, ExecuteCommandParams, CodeActionParams, FoldingRangeRequestParam, DocumentColorParams, ColorPresentationParams } from 'vscode-languageserver-protocol'; import { getLanguageService, LanguageService, JSONDocument } from "vscode-json-languageservice"; +import * as TextDocumentImpl from "vscode-languageserver-textdocument"; export function start(reader: MessageReader, writer: MessageWriter): JsonServer { const connection = createConnection(reader, writer); @@ -25,7 +26,7 @@ export class JsonServer { protected workspaceRoot: URI | undefined; - protected readonly documents = new TextDocuments(); + protected readonly documents = new TextDocuments(TextDocumentImpl.TextDocument); protected readonly jsonService: LanguageService = getLanguageService({ schemaRequestService: this.resolveSchema.bind(this) diff --git a/yarn.lock b/yarn.lock index ef87cadbd..7d24d459e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7064,13 +7064,18 @@ vscode-jsonrpc@^5.0.0: resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0.tgz#445be9fb404e2793a91b9c0cef3c52dec3e02b89" integrity sha512-QeAniC/xTWauVQgyNgEqNJ0Qm/Jw8QySGRQhRFPwb8c4FPp9k6QNgJp0ayXWws5qhdaHkiXkGPlzjOPZFQQKLw== -vscode-languageclient@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.0.0.tgz#777a90ca399c4a4d942b3012c0ad2ec47409c4e5" - integrity sha512-6MDksAP79GRbcHFsXS6ndo12s0m/h7eNdS/IanRgWxaezqB4a4KzHIHrE0bE+nSFB+snaSToGs1bxnPeKdO5fQ== +vscode-jsonrpc@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794" + integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A== + +vscode-languageclient@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.0.1.tgz#acd138e0a19a40c5788365e882ae11c164d9a460" + integrity sha512-7yZaSHichTJEyOJykI2RLQEECf9MqNLoklzC/1OVi/M8ioIsWQ1+lkN1nTsUhd6+F7p9ar9dNmPiEhL0i5uUBA== dependencies: semver "^6.3.0" - vscode-languageserver-protocol "^3.15.0" + vscode-languageserver-protocol "^3.15.1" vscode-languageserver-protocol@^3.15.0: version "3.15.0" @@ -7080,6 +7085,19 @@ vscode-languageserver-protocol@^3.15.0: vscode-jsonrpc "^5.0.0" vscode-languageserver-types "3.15.0" +vscode-languageserver-protocol@^3.15.1: + version "3.15.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.1.tgz#7555e595f0058b9a166f14605ad039e97fab320a" + integrity sha512-wJAo06VM9ZBnRqslplDjfz6Tdive0O7z44yNxBFA3x0/YZkXBIL6I+9rwQ/9Y//0X0eCh12FQrj+KmEXf2L5eA== + dependencies: + vscode-jsonrpc "^5.0.1" + vscode-languageserver-types "3.15.0" + +vscode-languageserver-textdocument@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0.tgz#957381672eb3f507aa320e9f6d7efdfcb767d9fe" + integrity sha512-9E3hfoknSe9wX5Bed4rFbjkWdT9Oazw+suyCQ6ZbS68r3SAwue5M7xHd9WX9jBHguAai+qmwr5dMIf7gmzQryw== + vscode-languageserver-types@3.15.0: version "3.15.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0.tgz#c45a23308ec0967135c483b759dfaf97978d9e0a"