diff options
-rw-r--r-- | Cargo.lock | 16 | ||||
-rw-r--r-- | crates/gen_lsp_server/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index f09cf98c8..5912659d4 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -46,7 +46,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
46 | 46 | ||
47 | [[package]] | 47 | [[package]] |
48 | name = "backtrace" | 48 | name = "backtrace" |
49 | version = "0.3.13" | 49 | version = "0.3.14" |
50 | source = "registry+https://github.com/rust-lang/crates.io-index" | 50 | source = "registry+https://github.com/rust-lang/crates.io-index" |
51 | dependencies = [ | 51 | dependencies = [ |
52 | "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", | 52 | "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -319,7 +319,7 @@ name = "error-chain" | |||
319 | version = "0.12.0" | 319 | version = "0.12.0" |
320 | source = "registry+https://github.com/rust-lang/crates.io-index" | 320 | source = "registry+https://github.com/rust-lang/crates.io-index" |
321 | dependencies = [ | 321 | dependencies = [ |
322 | "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", | 322 | "backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", |
323 | ] | 323 | ] |
324 | 324 | ||
325 | [[package]] | 325 | [[package]] |
@@ -327,7 +327,7 @@ name = "failure" | |||
327 | version = "0.1.5" | 327 | version = "0.1.5" |
328 | source = "registry+https://github.com/rust-lang/crates.io-index" | 328 | source = "registry+https://github.com/rust-lang/crates.io-index" |
329 | dependencies = [ | 329 | dependencies = [ |
330 | "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", | 330 | "backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", |
331 | "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | 331 | "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", |
332 | ] | 332 | ] |
333 | 333 | ||
@@ -431,7 +431,7 @@ dependencies = [ | |||
431 | "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", | 431 | "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", |
432 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | 432 | "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", |
433 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 433 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
434 | "lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)", | 434 | "lsp-types 0.56.0 (registry+https://github.com/rust-lang/crates.io-index)", |
435 | "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", | 435 | "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", |
436 | "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", | 436 | "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", |
437 | ] | 437 | ] |
@@ -633,7 +633,7 @@ dependencies = [ | |||
633 | 633 | ||
634 | [[package]] | 634 | [[package]] |
635 | name = "lsp-types" | 635 | name = "lsp-types" |
636 | version = "0.55.4" | 636 | version = "0.56.0" |
637 | source = "registry+https://github.com/rust-lang/crates.io-index" | 637 | source = "registry+https://github.com/rust-lang/crates.io-index" |
638 | dependencies = [ | 638 | dependencies = [ |
639 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | 639 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1043,7 +1043,7 @@ dependencies = [ | |||
1043 | "flexi_logger 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", | 1043 | "flexi_logger 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", |
1044 | "gen_lsp_server 0.1.0", | 1044 | "gen_lsp_server 0.1.0", |
1045 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1045 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
1046 | "lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1046 | "lsp-types 0.56.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1047 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1047 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1048 | "ra_arena 0.1.0", | 1048 | "ra_arena 0.1.0", |
1049 | "ra_ide_api 0.1.0", | 1049 | "ra_ide_api 0.1.0", |
@@ -1892,7 +1892,7 @@ dependencies = [ | |||
1892 | "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" | 1892 | "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" |
1893 | "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" | 1893 | "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" |
1894 | "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" | 1894 | "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" |
1895 | "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" | 1895 | "checksum backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "cd5a90e2b463010cd0e0ce9a11d4a9d5d58d9f41d4a6ba3dcaf9e68b466e88b4" |
1896 | "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" | 1896 | "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" |
1897 | "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" | 1897 | "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" |
1898 | "checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a" | 1898 | "checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a" |
@@ -1964,7 +1964,7 @@ dependencies = [ | |||
1964 | "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" | 1964 | "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" |
1965 | "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" | 1965 | "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" |
1966 | "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" | 1966 | "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" |
1967 | "checksum lsp-types 0.55.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6392b5843615b8a2adeebe87b83fdd29567c0870baba3407a67e6dbfee4712f8" | 1967 | "checksum lsp-types 0.56.0 (registry+https://github.com/rust-lang/crates.io-index)" = "31954f2cf354421e6f99a48fdcfd5c3113c675a0db311960ffdac0b8d45cf09c" |
1968 | "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" | 1968 | "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" |
1969 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" | 1969 | "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" |
1970 | "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" | 1970 | "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" |
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml index a252c911c..9e0d819d0 100644 --- a/crates/gen_lsp_server/Cargo.toml +++ b/crates/gen_lsp_server/Cargo.toml | |||
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" | |||
8 | description = "Generic LSP server scaffold." | 8 | description = "Generic LSP server scaffold." |
9 | 9 | ||
10 | [dependencies] | 10 | [dependencies] |
11 | lsp-types = "0.55.0" | 11 | lsp-types = "0.56.0" |
12 | log = "0.4.3" | 12 | log = "0.4.3" |
13 | failure = "0.1.4" | 13 | failure = "0.1.4" |
14 | serde_json = "1.0.34" | 14 | serde_json = "1.0.34" |
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 6342e0628..ef6dea393 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.10.0" | 15 | flexi_logger = "0.10.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.55.0" | 18 | lsp-types = "0.56.0" |
19 | rustc-hash = "1.0" | 19 | rustc-hash = "1.0" |
20 | parking_lot = "0.7.0" | 20 | parking_lot = "0.7.0" |
21 | 21 | ||
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 9208ee473..9abd4054e 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -419,7 +419,7 @@ pub fn handle_signature_help( | |||
419 | Ok(Some(req::SignatureHelp { | 419 | Ok(Some(req::SignatureHelp { |
420 | signatures: vec![sig_info], | 420 | signatures: vec![sig_info], |
421 | active_signature: Some(0), | 421 | active_signature: Some(0), |
422 | active_parameter: call_info.active_parameter.map(|it| it as u64), | 422 | active_parameter: call_info.active_parameter.map(|it| it as i64), |
423 | })) | 423 | })) |
424 | } else { | 424 | } else { |
425 | Ok(None) | 425 | Ok(None) |