aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock20
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/to_proto.rs12
3 files changed, 20 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 72ec68624..cf88c4e17 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -140,9 +140,9 @@ dependencies = [
140 140
141[[package]] 141[[package]]
142name = "cc" 142name = "cc"
143version = "1.0.59" 143version = "1.0.60"
144source = "registry+https://github.com/rust-lang/crates.io-index" 144source = "registry+https://github.com/rust-lang/crates.io-index"
145checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" 145checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
146 146
147[[package]] 147[[package]]
148name = "cfg" 148name = "cfg"
@@ -311,9 +311,9 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
311 311
312[[package]] 312[[package]]
313name = "either" 313name = "either"
314version = "1.6.0" 314version = "1.6.1"
315source = "registry+https://github.com/rust-lang/crates.io-index" 315source = "registry+https://github.com/rust-lang/crates.io-index"
316checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" 316checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
317 317
318[[package]] 318[[package]]
319name = "ena" 319name = "ena"
@@ -775,9 +775,9 @@ dependencies = [
775 775
776[[package]] 776[[package]]
777name = "lsp-types" 777name = "lsp-types"
778version = "0.80.0" 778version = "0.81.0"
779source = "registry+https://github.com/rust-lang/crates.io-index" 779source = "registry+https://github.com/rust-lang/crates.io-index"
780checksum = "f4265e2715bdacbb4dad029fce525e420cd66dc0af24ff9cb996a8ab48ac92ef" 780checksum = "5e02724627e9ef8ba91f461ebc01d48aebbd13a4b7c9dc547a0a2890f53e2171"
781dependencies = [ 781dependencies = [
782 "base64", 782 "base64",
783 "bitflags", 783 "bitflags",
@@ -1187,9 +1187,9 @@ dependencies = [
1187 1187
1188[[package]] 1188[[package]]
1189name = "rayon-core" 1189name = "rayon-core"
1190version = "1.8.0" 1190version = "1.8.1"
1191source = "registry+https://github.com/rust-lang/crates.io-index" 1191source = "registry+https://github.com/rust-lang/crates.io-index"
1192checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" 1192checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
1193dependencies = [ 1193dependencies = [
1194 "crossbeam-channel", 1194 "crossbeam-channel",
1195 "crossbeam-deque", 1195 "crossbeam-deque",
@@ -1493,9 +1493,9 @@ version = "0.0.0"
1493 1493
1494[[package]] 1494[[package]]
1495name = "syn" 1495name = "syn"
1496version = "1.0.40" 1496version = "1.0.41"
1497source = "registry+https://github.com/rust-lang/crates.io-index" 1497source = "registry+https://github.com/rust-lang/crates.io-index"
1498checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" 1498checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
1499dependencies = [ 1499dependencies = [
1500 "proc-macro2", 1500 "proc-macro2",
1501 "quote", 1501 "quote",
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 8db0b0d72..0fbb9cb0d 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -21,7 +21,7 @@ env_logger = { version = "0.7.1", default-features = false }
21itertools = "0.9.0" 21itertools = "0.9.0"
22jod-thread = "0.1.0" 22jod-thread = "0.1.0"
23log = "0.4.8" 23log = "0.4.8"
24lsp-types = { version = "0.80.0", features = ["proposed"] } 24lsp-types = { version = "0.81.0", features = ["proposed"] }
25parking_lot = "0.11.0" 25parking_lot = "0.11.0"
26pico-args = "0.3.1" 26pico-args = "0.3.1"
27oorandom = "11.1.2" 27oorandom = "11.1.2"
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index dcbf837d6..59e780b7d 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -285,12 +285,18 @@ pub(crate) fn signature_help(
285 }) 285 })
286 }; 286 };
287 287
288 let signature = 288 let active_parameter = call_info.active_parameter.map(|it| it as i64);
289 lsp_types::SignatureInformation { label, documentation, parameters: Some(parameters) }; 289
290 let signature = lsp_types::SignatureInformation {
291 label,
292 documentation,
293 parameters: Some(parameters),
294 active_parameter,
295 };
290 lsp_types::SignatureHelp { 296 lsp_types::SignatureHelp {
291 signatures: vec![signature], 297 signatures: vec![signature],
292 active_signature: None, 298 active_signature: None,
293 active_parameter: call_info.active_parameter.map(|it| it as i64), 299 active_parameter,
294 } 300 }
295} 301}
296 302