diff options
| author | kjeremy <[email protected]> | 2020-10-21 19:57:55 +0100 |
|---|---|---|
| committer | kjeremy <[email protected]> | 2020-10-26 13:23:34 +0000 |
| commit | 5cb6fafd366158ac5d9461819dbb0fb7018ad685 (patch) | |
| tree | 4cced8415251921c09efe4fec71a36a2c9da0aa2 /editors | |
| parent | 35ed3d2c005fdb0ec9ab78a52b31758bd7de298e (diff) | |
Latest proposed LSP 3.16.0
Needs: https://github.com/gluon-lang/lsp-types/pull/183
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/code/package-lock.json | 30 | ||||
| -rw-r--r-- | editors/code/package.json | 2 | ||||
| -rw-r--r-- | editors/code/src/util.ts | 5 |
3 files changed, 18 insertions, 19 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index 33d60d4dd..86c3730ad 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json | |||
| @@ -2409,32 +2409,32 @@ | |||
| 2409 | } | 2409 | } |
| 2410 | }, | 2410 | }, |
| 2411 | "vscode-jsonrpc": { | 2411 | "vscode-jsonrpc": { |
| 2412 | "version": "6.0.0-next.5", | 2412 | "version": "6.0.0-next.6", |
| 2413 | "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz", | 2413 | "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.6.tgz", |
| 2414 | "integrity": "sha512-IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ==" | 2414 | "integrity": "sha512-w3w1T9tGsInSbGyv2kpi4o6ciMIyfVkM+kAvkxEv4zIv3fs69q3Qyt7ZMLiXnaRFXecIOY2ALDKwIMi0n2IwHQ==" |
| 2415 | }, | 2415 | }, |
| 2416 | "vscode-languageclient": { | 2416 | "vscode-languageclient": { |
| 2417 | "version": "7.0.0-next.9", | 2417 | "version": "7.0.0-next.10", |
| 2418 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz", | 2418 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.10.tgz", |
| 2419 | "integrity": "sha512-lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A==", | 2419 | "integrity": "sha512-J9Hp64j1aaQfXlhMPGI1XAcdsIcSNPAL6022JElzgxsfAydmQfZeKCCNdyybjhmZ+xrep2yoVRAeD5TZFP7y6g==", |
| 2420 | "requires": { | 2420 | "requires": { |
| 2421 | "semver": "^6.3.0", | 2421 | "semver": "^6.3.0", |
| 2422 | "vscode-languageserver-protocol": "3.16.0-next.7" | 2422 | "vscode-languageserver-protocol": "3.16.0-next.8" |
| 2423 | } | 2423 | } |
| 2424 | }, | 2424 | }, |
| 2425 | "vscode-languageserver-protocol": { | 2425 | "vscode-languageserver-protocol": { |
| 2426 | "version": "3.16.0-next.7", | 2426 | "version": "3.16.0-next.8", |
| 2427 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz", | 2427 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.8.tgz", |
| 2428 | "integrity": "sha512-tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ==", | 2428 | "integrity": "sha512-AWMc7vVN7xuTpQf6A7yvaYjxyKEeMBQWJpkcRgT3EFAYU8PXJK2NCL0wPrgHH2soF/bErxJwajA1vNtCqrsRsg==", |
| 2429 | "requires": { | 2429 | "requires": { |
| 2430 | "vscode-jsonrpc": "6.0.0-next.5", | 2430 | "vscode-jsonrpc": "6.0.0-next.6", |
| 2431 | "vscode-languageserver-types": "3.16.0-next.3" | 2431 | "vscode-languageserver-types": "3.16.0-next.4" |
| 2432 | } | 2432 | } |
| 2433 | }, | 2433 | }, |
| 2434 | "vscode-languageserver-types": { | 2434 | "vscode-languageserver-types": { |
| 2435 | "version": "3.16.0-next.3", | 2435 | "version": "3.16.0-next.4", |
| 2436 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz", | 2436 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz", |
| 2437 | "integrity": "sha512-s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg==" | 2437 | "integrity": "sha512-NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA==" |
| 2438 | }, | 2438 | }, |
| 2439 | "vscode-test": { | 2439 | "vscode-test": { |
| 2440 | "version": "1.4.0", | 2440 | "version": "1.4.0", |
diff --git a/editors/code/package.json b/editors/code/package.json index af845d7bc..26044491c 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | }, | 36 | }, |
| 37 | "dependencies": { | 37 | "dependencies": { |
| 38 | "node-fetch": "^2.6.1", | 38 | "node-fetch": "^2.6.1", |
| 39 | "vscode-languageclient": "7.0.0-next.9" | 39 | "vscode-languageclient": "7.0.0-next.10" |
| 40 | }, | 40 | }, |
| 41 | "devDependencies": { | 41 | "devDependencies": { |
| 42 | "@rollup/plugin-commonjs": "^13.0.2", | 42 | "@rollup/plugin-commonjs": "^13.0.2", |
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts index 08159b43c..53492a445 100644 --- a/editors/code/src/util.ts +++ b/editors/code/src/util.ts | |||
| @@ -75,12 +75,11 @@ export async function sendRequestWithRetry<TParam, TRet>( | |||
| 75 | log.warn("LSP request timed out", { method: reqType.method, param, error }); | 75 | log.warn("LSP request timed out", { method: reqType.method, param, error }); |
| 76 | throw error; | 76 | throw error; |
| 77 | } | 77 | } |
| 78 | 78 | if (error.code === lc.LSPErrorCodes.RequestCancelled) { | |
| 79 | if (error.code === lc.ErrorCodes.RequestCancelled) { | ||
| 80 | throw error; | 79 | throw error; |
| 81 | } | 80 | } |
| 82 | 81 | ||
| 83 | if (error.code !== lc.ErrorCodes.ContentModified) { | 82 | if (error.code !== lc.LSPErrorCodes.ContentModified) { |
| 84 | log.warn("LSP request failed", { method: reqType.method, param, error }); | 83 | log.warn("LSP request failed", { method: reqType.method, param, error }); |
| 85 | throw error; | 84 | throw error; |
| 86 | } | 85 | } |