diff options
-rw-r--r-- | crates/rust-analyzer/src/handlers.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 2 | ||||
-rw-r--r-- | editors/code/src/inlay_hints.ts | 1 | ||||
-rw-r--r-- | editors/code/src/lsp_ext.ts | 2 |
4 files changed, 3 insertions, 4 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 | ||
297 | pub(crate) fn inlay_int(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_ext::InlayHint { | 297 | pub(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/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts index 7b481fc72..30ade9b98 100644 --- a/editors/code/src/inlay_hints.ts +++ b/editors/code/src/inlay_hints.ts | |||
@@ -111,7 +111,6 @@ class HintsUpdater implements Disposable { | |||
111 | } | 111 | } |
112 | 112 | ||
113 | syncCacheAndRenderHints() { | 113 | syncCacheAndRenderHints() { |
114 | // FIXME: make inlayHints request pass an array of files? | ||
115 | this.sourceFiles.forEach((file, uri) => this.fetchHints(file).then(hints => { | 114 | this.sourceFiles.forEach((file, uri) => this.fetchHints(file).then(hints => { |
116 | if (!hints) return; | 115 | if (!hints) return; |
117 | 116 | ||
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 | ||
5 | import * as lc from "vscode-languageclient"; | 5 | import * as lc from "vscode-languageclient"; |