From fd83f469e9643c7a9da2d9e4c796bd89c441458d Mon Sep 17 00:00:00 2001
From: Yuki Kodama <endflow.net@gmail.com>
Date: Tue, 26 May 2020 01:05:50 +0900
Subject: Trim at presentation layer

---
 crates/ra_ide/src/completion/presentation.rs    | 2 +-
 crates/ra_ide/src/display/function_signature.rs | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index e59f730ff..61565c84f 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -211,7 +211,7 @@ impl Completions {
             .parameter_names
             .iter()
             .skip(if function_signature.has_self_param { 1 } else { 0 })
-            .cloned()
+            .map(|name| name.trim_start_matches('_').into())
             .collect();
 
         builder = builder.add_call_parens(ctx, name, Params::Named(params));
diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
index fabc78f14..9572debd8 100644
--- a/crates/ra_ide/src/display/function_signature.rs
+++ b/crates/ra_ide/src/display/function_signature.rs
@@ -237,9 +237,7 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
                                     .descendants()
                                     .find_map(ast::Name::cast)?
                                     .text()
-                                    .to_string()
-                                    .trim_start_matches('_')
-                                    .into(),
+                                    .to_string(),
                             )
                         })
                         .map(|param| param.unwrap_or_default()),
-- 
cgit v1.2.3