diff options
-rw-r--r-- | Cargo.lock | 4 | ||||
-rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/caps.rs | 3 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 5 | ||||
-rw-r--r-- | editors/code/package-lock.json | 71 | ||||
-rw-r--r-- | editors/code/package.json | 6 |
6 files changed, 54 insertions, 37 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4476d188b..31a850797 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -844,9 +844,9 @@ dependencies = [ | |||
844 | 844 | ||
845 | [[package]] | 845 | [[package]] |
846 | name = "lsp-types" | 846 | name = "lsp-types" |
847 | version = "0.85.0" | 847 | version = "0.86.0" |
848 | source = "registry+https://github.com/rust-lang/crates.io-index" | 848 | source = "registry+https://github.com/rust-lang/crates.io-index" |
849 | checksum = "857650f3e83fb62f89d15410414e0ed7d0735445020da398d37f65d20a5423b9" | 849 | checksum = "f2a5c40d566f2704dac30859bca152217583fc94fd5b178d8baba915e1abd382" |
850 | dependencies = [ | 850 | dependencies = [ |
851 | "base64", | 851 | "base64", |
852 | "bitflags", | 852 | "bitflags", |
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 039976e4b..0b4d3f4eb 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml | |||
@@ -21,7 +21,7 @@ env_logger = { version = "0.8.1", default-features = false } | |||
21 | itertools = "0.9.0" | 21 | itertools = "0.9.0" |
22 | jod-thread = "0.1.0" | 22 | jod-thread = "0.1.0" |
23 | log = "0.4.8" | 23 | log = "0.4.8" |
24 | lsp-types = { version = "0.85.0", features = ["proposed"] } | 24 | lsp-types = { version = "0.86.0", features = ["proposed"] } |
25 | parking_lot = "0.11.0" | 25 | parking_lot = "0.11.0" |
26 | pico-args = "0.3.1" | 26 | pico-args = "0.3.1" |
27 | oorandom = "11.1.2" | 27 | oorandom = "11.1.2" |
diff --git a/crates/rust-analyzer/src/caps.rs b/crates/rust-analyzer/src/caps.rs index 5e4c22bc5..de5eb93b5 100644 --- a/crates/rust-analyzer/src/caps.rs +++ b/crates/rust-analyzer/src/caps.rs | |||
@@ -64,7 +64,7 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti | |||
64 | prepare_provider: Some(true), | 64 | prepare_provider: Some(true), |
65 | work_done_progress_options: WorkDoneProgressOptions { work_done_progress: None }, | 65 | work_done_progress_options: WorkDoneProgressOptions { work_done_progress: None }, |
66 | })), | 66 | })), |
67 | on_type_rename_provider: None, | 67 | linked_editing_range_provider: None, |
68 | document_link_provider: None, | 68 | document_link_provider: None, |
69 | color_provider: None, | 69 | color_provider: None, |
70 | execute_command_provider: None, | 70 | execute_command_provider: None, |
@@ -83,6 +83,7 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti | |||
83 | } | 83 | } |
84 | .into(), | 84 | .into(), |
85 | ), | 85 | ), |
86 | moniker_provider: None, | ||
86 | experimental: Some(json!({ | 87 | experimental: Some(json!({ |
87 | "joinLines": true, | 88 | "joinLines": true, |
88 | "ssr": true, | 89 | "ssr": true, |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 715f8927a..72f77a016 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -633,7 +633,7 @@ pub(crate) fn resource_op( | |||
633 | lsp_types::ResourceOp::Create(lsp_types::CreateFile { | 633 | lsp_types::ResourceOp::Create(lsp_types::CreateFile { |
634 | uri, | 634 | uri, |
635 | options: None, | 635 | options: None, |
636 | annotation: None, | 636 | annotation_id: None, |
637 | }) | 637 | }) |
638 | } | 638 | } |
639 | FileSystemEdit::MoveFile { src, dst } => { | 639 | FileSystemEdit::MoveFile { src, dst } => { |
@@ -643,7 +643,7 @@ pub(crate) fn resource_op( | |||
643 | old_uri, | 643 | old_uri, |
644 | new_uri, | 644 | new_uri, |
645 | options: None, | 645 | options: None, |
646 | annotation: None, | 646 | annotation_id: None, |
647 | }) | 647 | }) |
648 | } | 648 | } |
649 | } | 649 | } |
@@ -708,6 +708,7 @@ impl From<lsp_ext::SnippetWorkspaceEdit> for lsp_types::WorkspaceEdit { | |||
708 | .collect(), | 708 | .collect(), |
709 | ) | 709 | ) |
710 | }), | 710 | }), |
711 | change_annotations: None, | ||
711 | } | 712 | } |
712 | } | 713 | } |
713 | } | 714 | } |
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index e83b116a7..2d717e366 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.51.0", | 198 | "version": "1.52.0", |
199 | "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.51.0.tgz", | 199 | "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz", |
200 | "integrity": "sha512-C/jZ35OT5k/rsJyAK8mS1kM++vMcm89oSWegkzxRCvHllIq0cToZAkIDs6eCY4SKrvik3nrhELizyLcM0onbQA==", | 200 | "integrity": "sha512-Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA==", |
201 | "dev": true | 201 | "dev": true |
202 | }, | 202 | }, |
203 | "@typescript-eslint/eslint-plugin": { | 203 | "@typescript-eslint/eslint-plugin": { |
@@ -455,8 +455,7 @@ | |||
455 | "balanced-match": { | 455 | "balanced-match": { |
456 | "version": "1.0.0", | 456 | "version": "1.0.0", |
457 | "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", | 457 | "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", |
458 | "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", | 458 | "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" |
459 | "dev": true | ||
460 | }, | 459 | }, |
461 | "binary-extensions": { | 460 | "binary-extensions": { |
462 | "version": "2.1.0", | 461 | "version": "2.1.0", |
@@ -474,7 +473,6 @@ | |||
474 | "version": "1.1.11", | 473 | "version": "1.1.11", |
475 | "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", | 474 | "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", |
476 | "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", | 475 | "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", |
477 | "dev": true, | ||
478 | "requires": { | 476 | "requires": { |
479 | "balanced-match": "^1.0.0", | 477 | "balanced-match": "^1.0.0", |
480 | "concat-map": "0.0.1" | 478 | "concat-map": "0.0.1" |
@@ -673,8 +671,7 @@ | |||
673 | "concat-map": { | 671 | "concat-map": { |
674 | "version": "0.0.1", | 672 | "version": "0.0.1", |
675 | "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", | 673 | "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", |
676 | "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", | 674 | "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" |
677 | "dev": true | ||
678 | }, | 675 | }, |
679 | "cross-spawn": { | 676 | "cross-spawn": { |
680 | "version": "7.0.3", | 677 | "version": "7.0.3", |
@@ -1622,7 +1619,6 @@ | |||
1622 | "version": "3.0.4", | 1619 | "version": "3.0.4", |
1623 | "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", | 1620 | "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", |
1624 | "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", | 1621 | "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", |
1625 | "dev": true, | ||
1626 | "requires": { | 1622 | "requires": { |
1627 | "brace-expansion": "^1.1.7" | 1623 | "brace-expansion": "^1.1.7" |
1628 | } | 1624 | } |
@@ -2021,9 +2017,27 @@ | |||
2021 | "dev": true | 2017 | "dev": true |
2022 | }, | 2018 | }, |
2023 | "semver": { | 2019 | "semver": { |
2024 | "version": "6.3.0", | 2020 | "version": "7.3.4", |
2025 | "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", | 2021 | "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", |
2026 | "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" | 2022 | "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", |
2023 | "requires": { | ||
2024 | "lru-cache": "^6.0.0" | ||
2025 | }, | ||
2026 | "dependencies": { | ||
2027 | "lru-cache": { | ||
2028 | "version": "6.0.0", | ||
2029 | "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", | ||
2030 | "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", | ||
2031 | "requires": { | ||
2032 | "yallist": "^4.0.0" | ||
2033 | } | ||
2034 | }, | ||
2035 | "yallist": { | ||
2036 | "version": "4.0.0", | ||
2037 | "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||
2038 | "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" | ||
2039 | } | ||
2040 | } | ||
2027 | }, | 2041 | }, |
2028 | "serialize-javascript": { | 2042 | "serialize-javascript": { |
2029 | "version": "5.0.1", | 2043 | "version": "5.0.1", |
@@ -2350,32 +2364,33 @@ | |||
2350 | } | 2364 | } |
2351 | }, | 2365 | }, |
2352 | "vscode-jsonrpc": { | 2366 | "vscode-jsonrpc": { |
2353 | "version": "6.0.0-next.7", | 2367 | "version": "6.0.0", |
2354 | "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz", | 2368 | "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", |
2355 | "integrity": "sha512-1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug==" | 2369 | "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==" |
2356 | }, | 2370 | }, |
2357 | "vscode-languageclient": { | 2371 | "vscode-languageclient": { |
2358 | "version": "7.0.0-next.14", | 2372 | "version": "7.0.0", |
2359 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.14.tgz", | 2373 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", |
2360 | "integrity": "sha512-QUccfXK2F6AXXRFR8QJCaIz7N2BhJK6ok8E1aO8LHq2IBU33+5hTSJBXs7nEqrqZ/cY2VlDDbMWtMvCxz+/y1w==", | 2374 | "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", |
2361 | "requires": { | 2375 | "requires": { |
2362 | "semver": "^6.3.0", | 2376 | "minimatch": "^3.0.4", |
2363 | "vscode-languageserver-protocol": "3.16.0-next.11" | 2377 | "semver": "^7.3.4", |
2378 | "vscode-languageserver-protocol": "3.16.0" | ||
2364 | } | 2379 | } |
2365 | }, | 2380 | }, |
2366 | "vscode-languageserver-protocol": { | 2381 | "vscode-languageserver-protocol": { |
2367 | "version": "3.16.0-next.11", | 2382 | "version": "3.16.0", |
2368 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.11.tgz", | 2383 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", |
2369 | "integrity": "sha512-31FmupmSmfznuMuGp7qN6h3d/hKUbexbvcwTvrUE/igqRlzFU542s8MtGICx1ERbVuDOLGp96W2Z92qbUbmBPA==", | 2384 | "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", |
2370 | "requires": { | 2385 | "requires": { |
2371 | "vscode-jsonrpc": "6.0.0-next.7", | 2386 | "vscode-jsonrpc": "6.0.0", |
2372 | "vscode-languageserver-types": "3.16.0-next.5" | 2387 | "vscode-languageserver-types": "3.16.0" |
2373 | } | 2388 | } |
2374 | }, | 2389 | }, |
2375 | "vscode-languageserver-types": { | 2390 | "vscode-languageserver-types": { |
2376 | "version": "3.16.0-next.5", | 2391 | "version": "3.16.0", |
2377 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.5.tgz", | 2392 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", |
2378 | "integrity": "sha512-lf8Y1XXMtF1r2oDDAmJe+drizNXkybSRXAQQk5dPy2rYJsY9SPXYNO074L3THu9zNYepzV5fRJZUPo/V/TLBRQ==" | 2393 | "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" |
2379 | }, | 2394 | }, |
2380 | "vscode-test": { | 2395 | "vscode-test": { |
2381 | "version": "1.4.1", | 2396 | "version": "1.4.1", |
diff --git a/editors/code/package.json b/editors/code/package.json index 160a62e46..ad01fea7b 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.51.0" | 24 | "vscode": "^1.52.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-next.14" | 39 | "vscode-languageclient": "7.0.0" |
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.51.0", | 48 | "@types/vscode": "^1.52.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", |