Unnamed repository; edit this file 'description' to name the repository.
Merge #11647
11647: Improve inlay hint padding r=lnicola a=lnicola Co-authored-by: LaurenČ›iu Nicola <[email protected]>
bors[bot] 2022-03-08
parent 49646b7 · parent 8e3057d · commit 3f4a095
-rw-r--r--crates/rust-analyzer/src/to_proto.rs16
1 files changed, 13 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 3ba097dc7f..f25b2c8c69 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -418,7 +418,9 @@ pub(crate) fn inlay_hint(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_e
label: inlay_hint.label.to_string(),
position: match inlay_hint.kind {
InlayKind::ParameterHint => position(line_index, inlay_hint.range.start()),
- _ => position(line_index, inlay_hint.range.end()),
+ InlayKind::TypeHint | InlayKind::ChainingHint => {
+ position(line_index, inlay_hint.range.end())
+ }
},
kind: match inlay_hint.kind {
InlayKind::ParameterHint => Some(lsp_ext::InlayHintKind::PARAMETER),
@@ -426,8 +428,16 @@ pub(crate) fn inlay_hint(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_e
InlayKind::ChainingHint => None,
},
tooltip: None,
- padding_left: Some(true),
- padding_right: Some(true),
+ padding_left: Some(match inlay_hint.kind {
+ InlayKind::TypeHint => true,
+ InlayKind::ParameterHint => false,
+ InlayKind::ChainingHint => true,
+ }),
+ padding_right: Some(match inlay_hint.kind {
+ InlayKind::TypeHint => false,
+ InlayKind::ParameterHint => true,
+ InlayKind::ChainingHint => false,
+ }),
}
}