Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/rust-analyzer/src/lsp_ext.rs | 1 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 4 | ||||
| -rw-r--r-- | editors/code/src/inlay_hints.ts | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crates/rust-analyzer/src/lsp_ext.rs b/crates/rust-analyzer/src/lsp_ext.rs index 1681c766f3..f57080542c 100644 --- a/crates/rust-analyzer/src/lsp_ext.rs +++ b/crates/rust-analyzer/src/lsp_ext.rs @@ -247,7 +247,6 @@ pub struct InlayHintsParams { pub struct InlayHintKind(u8); impl InlayHintKind { - pub const OTHER: InlayHintKind = InlayHintKind(0); pub const TYPE: InlayHintKind = InlayHintKind(1); pub const PARAMETER: InlayHintKind = InlayHintKind(2); } diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 59b5a91739..73c9fed59b 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs @@ -413,11 +413,11 @@ pub(crate) fn signature_help( pub(crate) fn inlay_hint(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_ext::InlayHint { lsp_ext::InlayHint { label: inlay_hint.label.to_string(), - position: position(line_index, inlay_hint.range.start()), + position: position(line_index, inlay_hint.range.end()), kind: Some(match inlay_hint.kind { InlayKind::ParameterHint => lsp_ext::InlayHintKind::PARAMETER, InlayKind::TypeHint => lsp_ext::InlayHintKind::TYPE, - InlayKind::ChainingHint => lsp_ext::InlayHintKind::OTHER, + InlayKind::ChainingHint => lsp_ext::InlayHintKind::TYPE, }), tooltip: Some("test description".to_string()), padding_left: Some(true), diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts index b049ed4481..ff16ef3049 100644 --- a/editors/code/src/inlay_hints.ts +++ b/editors/code/src/inlay_hints.ts @@ -22,13 +22,14 @@ export function activateInlayHints(ctx: Ctx) { this.hintsProvider = vscode.languages.registerInlayHintsProvider({ scheme: 'file', language: 'rust' }, new class implements vscode.InlayHintsProvider { onDidChangeInlayHints = event; async provideInlayHints(document: vscode.TextDocument, range: vscode.Range, token: vscode.CancellationToken): Promise<vscode.InlayHint[]> { - console.log(document.uri.toString()); const request = { textDocument: { uri: document.uri.toString() }, range: { start: range.start, end: range.end } }; const hints = await sendRequestWithRetry(ctx.client, ra.inlayHints, request, token).catch(_ => null); - console.log(hints); if (hints == null) { return []; } else { + for (let hint of hints) { + hint.position = new vscode.Position(hint.position.line, hint.position.character); + } return hints; } } |