diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-14 19:52:38 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-14 19:52:38 +0000 |
commit | 7435b9e98c9280043605748c11a1f450669e04d6 (patch) | |
tree | 4f3b00e14059c52cc698cdd6088ffb643b90c5e7 /editors/code | |
parent | a0fa585515445e57ece48cb7847f8a933166cacd (diff) | |
parent | 8105418b25ad7d4d6facc68ab6818573f30b44a4 (diff) |
Merge #7661
7661: Start LSP 3.17 support r=kjeremy a=kjeremy
Companion to https://github.com/gluon-lang/lsp-types/pull/199 which <strike>has not been merged yet</strike> has been merged.
This doesn't opt into any 3.17 functionality yet.
Co-authored-by: Jeremy Kolb <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r-- | editors/code/package-lock.json | 36 | ||||
-rw-r--r-- | editors/code/package.json | 6 | ||||
-rw-r--r-- | editors/code/src/client.ts | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index 2d717e366..42077a7fa 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json | |||
@@ -195,9 +195,9 @@ | |||
195 | } | 195 | } |
196 | }, | 196 | }, |
197 | "@types/vscode": { | 197 | "@types/vscode": { |
198 | "version": "1.52.0", | 198 | "version": "1.53.0", |
199 | "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz", | 199 | "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.53.0.tgz", |
200 | "integrity": "sha512-Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA==", | 200 | "integrity": "sha512-XjFWbSPOM0EKIT2XhhYm3D3cx3nn3lshMUcWNy1eqefk+oqRuBq8unVb6BYIZqXy9lQZyeUl7eaBCOZWv+LcXQ==", |
201 | "dev": true | 201 | "dev": true |
202 | }, | 202 | }, |
203 | "@typescript-eslint/eslint-plugin": { | 203 | "@typescript-eslint/eslint-plugin": { |
@@ -2364,33 +2364,33 @@ | |||
2364 | } | 2364 | } |
2365 | }, | 2365 | }, |
2366 | "vscode-jsonrpc": { | 2366 | "vscode-jsonrpc": { |
2367 | "version": "6.0.0", | 2367 | "version": "6.1.0-next.1", |
2368 | "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", | 2368 | "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.1.tgz", |
2369 | "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==" | 2369 | "integrity": "sha512-2s1qEg8N97p8pooHnA8xgR4vnslCTJuE3rQqSQeJuSDklFcQSn9yW8gOinH/1vKeWiPuzHTG9FFty91v4v9Pag==" |
2370 | }, | 2370 | }, |
2371 | "vscode-languageclient": { | 2371 | "vscode-languageclient": { |
2372 | "version": "7.0.0", | 2372 | "version": "7.1.0-next.1", |
2373 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", | 2373 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.1.0-next.1.tgz", |
2374 | "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", | 2374 | "integrity": "sha512-pMdMyJ5e3CfdyvtDsj6ytTO+WcmrvtrFJWvBk4rZnIKmA3aCjrqTYI0XSWN/Cf4kcaV1J2+fTZf/2RcP2SzDiQ==", |
2375 | "requires": { | 2375 | "requires": { |
2376 | "minimatch": "^3.0.4", | 2376 | "minimatch": "^3.0.4", |
2377 | "semver": "^7.3.4", | 2377 | "semver": "^7.3.4", |
2378 | "vscode-languageserver-protocol": "3.16.0" | 2378 | "vscode-languageserver-protocol": "3.17.0-next.1" |
2379 | } | 2379 | } |
2380 | }, | 2380 | }, |
2381 | "vscode-languageserver-protocol": { | 2381 | "vscode-languageserver-protocol": { |
2382 | "version": "3.16.0", | 2382 | "version": "3.17.0-next.1", |
2383 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", | 2383 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.1.tgz", |
2384 | "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", | 2384 | "integrity": "sha512-cbFKGk+Q7HQ5RDdf6qiQrRv9qxR/87hBm/GrfLcQ5rmHPJOXg//ZYCXEQF+wSJNmcc6IrnET2cHJUxlZYHUEXA==", |
2385 | "requires": { | 2385 | "requires": { |
2386 | "vscode-jsonrpc": "6.0.0", | 2386 | "vscode-jsonrpc": "6.1.0-next.1", |
2387 | "vscode-languageserver-types": "3.16.0" | 2387 | "vscode-languageserver-types": "3.17.0-next.1" |
2388 | } | 2388 | } |
2389 | }, | 2389 | }, |
2390 | "vscode-languageserver-types": { | 2390 | "vscode-languageserver-types": { |
2391 | "version": "3.16.0", | 2391 | "version": "3.17.0-next.1", |
2392 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", | 2392 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.1.tgz", |
2393 | "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" | 2393 | "integrity": "sha512-VGzh06oynbYa6JbTKUbxOEZN7CYEtWhN7DK5wfzUpeCJl8X8xZX39g2PVfpqXrIEduu7dcJgK007KgnX9tHNKA==" |
2394 | }, | 2394 | }, |
2395 | "vscode-test": { | 2395 | "vscode-test": { |
2396 | "version": "1.4.1", | 2396 | "version": "1.4.1", |
diff --git a/editors/code/package.json b/editors/code/package.json index defa108cb..d26c64a57 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -21,7 +21,7 @@ | |||
21 | "Programming Languages" | 21 | "Programming Languages" |
22 | ], | 22 | ], |
23 | "engines": { | 23 | "engines": { |
24 | "vscode": "^1.52.0" | 24 | "vscode": "^1.53.0" |
25 | }, | 25 | }, |
26 | "enableProposedApi": true, | 26 | "enableProposedApi": true, |
27 | "scripts": { | 27 | "scripts": { |
@@ -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" | 39 | "vscode-languageclient": "^7.1.0-next.1" |
40 | }, | 40 | }, |
41 | "devDependencies": { | 41 | "devDependencies": { |
42 | "@rollup/plugin-commonjs": "^17.0.0", | 42 | "@rollup/plugin-commonjs": "^17.0.0", |
@@ -45,7 +45,7 @@ | |||
45 | "@types/mocha": "^8.0.4", | 45 | "@types/mocha": "^8.0.4", |
46 | "@types/node": "~12.12.6", | 46 | "@types/node": "~12.12.6", |
47 | "@types/node-fetch": "^2.5.7", | 47 | "@types/node-fetch": "^2.5.7", |
48 | "@types/vscode": "^1.52.0", | 48 | "@types/vscode": "^1.53.0", |
49 | "@typescript-eslint/eslint-plugin": "^4.9.0", | 49 | "@typescript-eslint/eslint-plugin": "^4.9.0", |
50 | "@typescript-eslint/parser": "^4.9.0", | 50 | "@typescript-eslint/parser": "^4.9.0", |
51 | "eslint": "^7.15.0", | 51 | "eslint": "^7.15.0", |
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index aec5c70c0..db5f4c023 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts | |||
@@ -79,7 +79,7 @@ export function createClient(serverPath: string, cwd: string, extraEnv: Env): lc | |||
79 | return hover; | 79 | return hover; |
80 | }, | 80 | }, |
81 | (error) => { | 81 | (error) => { |
82 | client.handleFailedRequest(lc.HoverRequest.type, error, null); | 82 | client.handleFailedRequest(lc.HoverRequest.type, token, error, null); |
83 | return Promise.resolve(null); | 83 | return Promise.resolve(null); |
84 | }); | 84 | }); |
85 | }, | 85 | }, |