Unnamed repository; edit this file 'description' to name the repository.
Merge #11658
11658: Add back colons around inlay hints r=Veykril a=lnicola Fixes https://github.com/rust-analyzer/rust-analyzer/issues/2797#issuecomment-1061594139. I originally thought that other extensions don't include the colons, but the TypeScript one seems to do. Co-authored-by: LaurenČ›iu Nicola <[email protected]>
bors[bot] 2022-03-08
parent 0f5df8e · parent 4a6ee45 · commit 4924072
-rw-r--r--crates/rust-analyzer/src/to_proto.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index f25b2c8c69..7809d24dd6 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -415,7 +415,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(),
+ label: match inlay_hint.kind {
+ InlayKind::ParameterHint => format!("{}:", inlay_hint.label),
+ InlayKind::TypeHint => format!(": {}", inlay_hint.label),
+ InlayKind::ChainingHint => inlay_hint.label.to_string(),
+ },
position: match inlay_hint.kind {
InlayKind::ParameterHint => position(line_index, inlay_hint.range.start()),
InlayKind::TypeHint | InlayKind::ChainingHint => {
@@ -429,7 +433,7 @@ pub(crate) fn inlay_hint(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_e
},
tooltip: None,
padding_left: Some(match inlay_hint.kind {
- InlayKind::TypeHint => true,
+ InlayKind::TypeHint => false,
InlayKind::ParameterHint => false,
InlayKind::ChainingHint => true,
}),