aboutsummaryrefslogtreecommitdiff
path: root/Cargo.lock
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-01-15 18:43:23 +0000
committerGitHub <[email protected]>2020-01-15 18:43:23 +0000
commitaa2e13b37f4508168fb064a79d0190fa705d8a47 (patch)
tree15d4b618885813c2c9efadd2ea0d25a7173807c8 /Cargo.lock
parent01422cc31d1917aaef4b1f402eda05abfff1e75f (diff)
parent79b77403b65877e4d20bbbac6dd853a3beead445 (diff)
Merge #2716
2716: Allow assists with multiple selectable actions r=SomeoneToIgnore a=SomeoneToIgnore This PR prepares an infra for https://github.com/rust-analyzer/rust-analyzer/issues/2180 task by adding a possibility to specify multiple actions in one assist as multiple edit parameters to the `applySourceChange` command. When this is done, the command opens a selection dialog, allowing the user to pick the edit to be applied. I have no working example to test in this PR, but here's a demo of an auto import feature (a separate PR coming later for that one) using this functionality: ![out](https://user-images.githubusercontent.com/2690773/71633614-f8ea4d80-2c1d-11ea-9b15-0e13611a7aa4.gif) The PR is not that massive as it may seem: all the assist files' changes are very generic and similar. Co-authored-by: Kirill Bulatov <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock3
1 files changed, 2 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a0444e97a..45c4de2b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -869,8 +869,8 @@ version = "0.1.0"
869name = "ra_assists" 869name = "ra_assists"
870version = "0.1.0" 870version = "0.1.0"
871dependencies = [ 871dependencies = [
872 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
872 "format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 873 "format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
873 "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
874 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 874 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
875 "ra_db 0.1.0", 875 "ra_db 0.1.0",
876 "ra_fmt 0.1.0", 876 "ra_fmt 0.1.0",
@@ -1066,6 +1066,7 @@ name = "ra_lsp_server"
1066version = "0.1.0" 1066version = "0.1.0"
1067dependencies = [ 1067dependencies = [
1068 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1068 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1069 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
1069 "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1070 "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
1070 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1071 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1071 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", 1072 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",