aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/rust-analyzer/src/handlers.rs2
-rw-r--r--crates/rust-analyzer/src/to_proto.rs2
-rw-r--r--editors/code/package.json8
-rw-r--r--editors/code/src/lsp_ext.ts2
4 files changed, 11 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 8568f7b05..d62dd0589 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -1075,7 +1075,7 @@ pub(crate) fn handle_inlay_hints(
1075 .analysis 1075 .analysis
1076 .inlay_hints(file_id, &snap.config.inlay_hints)? 1076 .inlay_hints(file_id, &snap.config.inlay_hints)?
1077 .into_iter() 1077 .into_iter()
1078 .map(|it| to_proto::inlay_int(&line_index, it)) 1078 .map(|it| to_proto::inlay_hint(&line_index, it))
1079 .collect()) 1079 .collect())
1080} 1080}
1081 1081
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index a5191c16e..a8173a338 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -294,7 +294,7 @@ pub(crate) fn signature_help(
294 } 294 }
295} 295}
296 296
297pub(crate) fn inlay_int(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_ext::InlayHint { 297pub(crate) fn inlay_hint(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_ext::InlayHint {
298 lsp_ext::InlayHint { 298 lsp_ext::InlayHint {
299 label: inlay_hint.label.to_string(), 299 label: inlay_hint.label.to_string(),
300 range: range(line_index, inlay_hint.range), 300 range: range(line_index, inlay_hint.range),
diff --git a/editors/code/package.json b/editors/code/package.json
index 93d94ed12..034090155 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -350,6 +350,14 @@
350 "default": null, 350 "default": null,
351 "description": "List of features to activate. Defaults to `rust-analyzer.cargo.features`." 351 "description": "List of features to activate. Defaults to `rust-analyzer.cargo.features`."
352 }, 352 },
353 "rust-analyzer.checkOnSave.target": {
354 "type": [
355 "null",
356 "string"
357 ],
358 "default": null,
359 "description": "Check for a specific target. Defaults to `rust-analyzer.cargo.target`."
360 },
353 "rust-analyzer.cargoRunner": { 361 "rust-analyzer.cargoRunner": {
354 "type": [ 362 "type": [
355 "null", 363 "null",
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts
index 8663737a6..f280bba3d 100644
--- a/editors/code/src/lsp_ext.ts
+++ b/editors/code/src/lsp_ext.ts
@@ -1,5 +1,5 @@
1/** 1/**
2 * This file mirrors `crates/rust-analyzer/src/req.rs` declarations. 2 * This file mirrors `crates/rust-analyzer/src/lsp_ext.rs` declarations.
3 */ 3 */
4 4
5import * as lc from "vscode-languageclient"; 5import * as lc from "vscode-languageclient";