Merge #2875

2875: Improve parameter hints a bit & add emacs support r=matklad a=flodiebold

 - just include the name, not e.g. `mut`
 - don't return empty hints (or `_`)

CC @brotzeit for the Emacs change

Co-authored-by: Florian Diebold <[email protected]>

1 files changed, 16 insertions, 3 deletions

diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
index ddc53a52b..1e4a472b4 100644
--- a/crates/ra_ide/src/display/function_signature.rs
+++ b/crates/ra_ide/src/display/function_signature.rs
@@ -169,9 +169,22 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
                     res.push(self_param.syntax().text().to_string())
                 }
 
-                res.extend(param_list.params().map(|param| {
-                    param.pat().map(|pat| pat.syntax().text().to_string()).unwrap_or_default()
-                }));
+                res.extend(
+                    param_list
+                        .params()
+                        .map(|param| {
+                            Some(
+                                param
+                                    .pat()?
+                                    .syntax()
+                                    .descendants()
+                                    .find_map(ast::Name::cast)?
+                                    .text()
+                                    .to_string(),
+                            )
+                        })
+                        .map(|param| param.unwrap_or_default()),
+                );
             }
             res
         }