Merge #5108

bors[bot] · matklad · web-flow · commit 117cf0b85bc8 · 2020-06-28T11:14:36.000Z
5108: Don't show ra_fixture param hints r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov &lt;aleksey.kladov@gmail.com&gt;
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
@@ -258,6 +258,7 @@ fn should_show_param_name_hint(
     if param_name.is_empty()
         || Some(param_name) == fn_signature.name.as_ref().map(|s| s.trim_start_matches('_'))
         || is_argument_similar_to_param_name(sema, argument, param_name)
+        || param_name.starts_with("ra_fixture")
     {
         return false;
     }
@@ -270,7 +271,7 @@ fn should_show_param_name_hint(
 
     // avoid displaying hints for common functions like map, filter, etc.
     // or other obvious words used in std
-    parameters_len != 1 || !is_obvious_param(param_name)
+    !(parameters_len == 1 && is_obvious_param(param_name))
 }
 
 fn is_argument_similar_to_param_name(

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,7 @@ fn should_show_param_name_hint(`
`258`	`258`	`if param_name.is_empty()`
`259`	`259`	`\|\| Some(param_name) == fn_signature.name.as_ref().map(\|s\| s.trim_start_matches('_'))`
`260`	`260`	`\|\| is_argument_similar_to_param_name(sema, argument, param_name)`
	`261`	`+ \|\| param_name.starts_with("ra_fixture")`
`261`	`262`	`{`
`262`	`263`	`return false;`
`263`	`264`	`}`
`@@ -270,7 +271,7 @@ fn should_show_param_name_hint(`
`270`	`271`
`271`	`272`	`// avoid displaying hints for common functions like map, filter, etc.`
`272`	`273`	`// or other obvious words used in std`
`273`		`- parameters_len != 1 \|\| !is_obvious_param(param_name)`
	`274`	`+ !(parameters_len == 1 && is_obvious_param(param_name))`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`fn is_argument_similar_to_param_name(`