diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index e68631f9f7..6df21e0e12 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs
@@ -592,23 +592,35 @@ fn param_name_hints(
         .filter_map(|((param, _ty), arg)| {
             // Only annotate hints for expressions that exist in the original file
             let range = sema.original_range_opt(arg.syntax())?;
-            let (param_name, param_syntax) = match param.as_ref()? {
-                Either::Left(pat) => ("self".to_string(), pat.syntax()),
+            let (param_name, name_syntax) = match param.as_ref()? {
+                Either::Left(pat) => ("self".to_string(), pat.name()),
                 Either::Right(pat) => match pat {
-                    ast::Pat::IdentPat(it) => (it.name()?.to_string(), pat.syntax()),
+                    ast::Pat::IdentPat(it) => (it.name()?.to_string(), it.name()),
                     _ => return None,
                 },
             };
-            Some((sema.original_range_opt(param_syntax), param_name, arg, range))
+            Some((name_syntax, param_name, arg, range))
         })
         .filter(|(_, param_name, arg, _)| {
             !should_hide_param_name_hint(sema, &callable, param_name, arg)
         })
-        .map(|(param_range, param_name, _, FileRange { range, .. })| InlayHint {
-            range,
-            kind: InlayKind::ParameterHint,
-            label: param_name,
-            tooltip: param_range.map(|it| InlayTooltip::HoverOffset(it.file_id, it.range.start())),
+        .map(|(param, param_name, _, FileRange { range, .. })| {
+            let mut tooltip = None;
+            if let Some(name) = param {
+                if let hir::CallableKind::Function(f) = callable.kind() {
+                    // assert the file is cached so we can map out of macros
+                    if let Some(_) = sema.source(f) {
+                        tooltip = sema.original_range_opt(name.syntax());
+                    }
+                }
+            }
+
+            InlayHint {
+                range,
+                kind: InlayKind::ParameterHint,
+                label: param_name,
+                tooltip: tooltip.map(|it| InlayTooltip::HoverOffset(it.file_id, it.range.start())),
+            }
         });
 
     acc.extend(hints);
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 5493180c5e..f91ab6ea79 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -472,27 +472,30 @@ pub(crate) fn inlay_hint(
             | InlayKind::ClosingBraceHint => None,
         },
         text_edits: None,
-        data: match inlay_hint.tooltip {
+        data: (|| match inlay_hint.tooltip {
             Some(ide::InlayTooltip::HoverOffset(file_id, offset)) => {
                 let uri = url(snap, file_id);
+                let line_index = snap.file_line_index(file_id).ok()?;
+
                 let text_document = lsp_types::TextDocumentIdentifier { uri };
                 to_value(lsp_ext::InlayHintResolveData {
                     text_document,
-                    position: lsp_ext::PositionOrRange::Position(position(line_index, offset)),
+                    position: lsp_ext::PositionOrRange::Position(position(&line_index, offset)),
                 })
                 .ok()
             }
             Some(ide::InlayTooltip::HoverRanged(file_id, text_range)) => {
                 let uri = url(snap, file_id);
                 let text_document = lsp_types::TextDocumentIdentifier { uri };
+                let line_index = snap.file_line_index(file_id).ok()?;
                 to_value(lsp_ext::InlayHintResolveData {
                     text_document,
-                    position: lsp_ext::PositionOrRange::Range(range(line_index, text_range)),
+                    position: lsp_ext::PositionOrRange::Range(range(&line_index, text_range)),
                 })
                 .ok()
             }
             _ => None,
-        },
+        })(),
         tooltip: Some(match inlay_hint.tooltip {
             Some(ide::InlayTooltip::String(s)) => lsp_types::InlayHintTooltip::String(s),
             _ => lsp_types::InlayHintTooltip::String(inlay_hint.label),