diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-21 15:28:16 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-21 15:28:16 +0000 |
commit | 55da8e786d2cac3cb6332f80c1ee715fbcbdee0d (patch) | |
tree | 19f74f3e1c08b975fbf5d9056fd89bec6f38a93a /crates | |
parent | 368bc56ac12ab5adbc263e0e8e25578934abe912 (diff) | |
parent | 56f48ac42a91576a9ee428c8217b0076ba0dc473 (diff) |
Merge #874
874: Update lsp-types and backtrace r=matklad a=kjeremy
Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates')
-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 |
3 files changed, 3 insertions, 3 deletions
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) |