From 8e3057d0a72ccea84508cca7f3faaf9531349ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Mon, 7 Mar 2022 19:18:36 +0200
Subject: [PATCH] Improve inlay hint padding

---
 crates/rust-analyzer/src/to_proto.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 3ba097dc7ff..f25b2c8c69d 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,
+        }),
     }
 }