diff options
author | Aleksey Kladov <[email protected]> | 2019-04-21 13:14:30 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-04-21 13:17:22 +0100 |
commit | 47672726d8df0b04693042cb44bf812b2459f226 (patch) | |
tree | 2514390a1b3180ad6fdce826ff412617da77e8eb | |
parent | fa15c4d75e87bd3bf761c91f030c76aec59308ae (diff) |
:arrow_up: lsp
-rw-r--r-- | Cargo.lock | 10 | ||||
-rw-r--r-- | Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 723c1ac5f..e5729f968 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -430,7 +430,7 @@ dependencies = [ | |||
430 | "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", | 430 | "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", |
431 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | 431 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", |
432 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 432 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
433 | "lsp-types 0.57.0 (git+https://github.com/matklad/lsp-types?branch=selection-range)", | 433 | "lsp-types 0.57.1 (registry+https://github.com/rust-lang/crates.io-index)", |
434 | "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", | 434 | "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", |
435 | "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", | 435 | "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", |
436 | ] | 436 | ] |
@@ -634,8 +634,8 @@ dependencies = [ | |||
634 | 634 | ||
635 | [[package]] | 635 | [[package]] |
636 | name = "lsp-types" | 636 | name = "lsp-types" |
637 | version = "0.57.0" | 637 | version = "0.57.1" |
638 | source = "git+https://github.com/matklad/lsp-types?branch=selection-range#6e37d45bcf411c18c22ab29ec155946ff001339e" | 638 | source = "registry+https://github.com/rust-lang/crates.io-index" |
639 | dependencies = [ | 639 | dependencies = [ |
640 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 640 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", |
641 | "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", | 641 | "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1027,7 +1027,7 @@ dependencies = [ | |||
1027 | "flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1027 | "flexi_logger 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)", |
1028 | "gen_lsp_server 0.1.0", | 1028 | "gen_lsp_server 0.1.0", |
1029 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1029 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
1030 | "lsp-types 0.57.0 (git+https://github.com/matklad/lsp-types?branch=selection-range)", | 1030 | "lsp-types 0.57.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1031 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1031 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1032 | "ra_arena 0.1.0", | 1032 | "ra_arena 0.1.0", |
1033 | "ra_ide_api 0.1.0", | 1033 | "ra_ide_api 0.1.0", |
@@ -1937,7 +1937,7 @@ dependencies = [ | |||
1937 | "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" | 1937 | "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" |
1938 | "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" | 1938 | "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" |
1939 | "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" | 1939 | "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" |
1940 | "checksum lsp-types 0.57.0 (git+https://github.com/matklad/lsp-types?branch=selection-range)" = "<none>" | 1940 | "checksum lsp-types 0.57.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cb6c75cb08c8d8507dd4e355171ec1f46689ae2820697ba892a233e5d8f7a167" |
1941 | "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" | 1941 | "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" |
1942 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" | 1942 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" |
1943 | "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" | 1943 | "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" |
diff --git a/Cargo.toml b/Cargo.toml index 0e474a184..c5155e899 100644 --- a/Cargo.toml +++ b/Cargo.toml | |||
@@ -6,4 +6,3 @@ incremental = true | |||
6 | debug = true | 6 | debug = true |
7 | 7 | ||
8 | [patch.'crates-io'] | 8 | [patch.'crates-io'] |
9 | lsp-types = { git = "https://github.com/matklad/lsp-types", branch = "selection-range" } | ||
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index c855d6f68..74861a56a 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -15,7 +15,7 @@ crossbeam-channel = "0.3.5" | |||
15 | flexi_logger = "0.11.0" | 15 | flexi_logger = "0.11.0" |
16 | log = "0.4.3" | 16 | log = "0.4.3" |
17 | url_serde = "0.2.0" | 17 | url_serde = "0.2.0" |
18 | lsp-types = "0.57.0" | 18 | lsp-types = { version = "0.57.1", features = ["proposed"] } |
19 | rustc-hash = "1.0" | 19 | rustc-hash = "1.0" |
20 | parking_lot = "0.7.0" | 20 | parking_lot = "0.7.0" |
21 | 21 | ||