diff options
Diffstat (limited to 'crates/ra_ide/src/inlay_hints.rs')
-rw-r--r-- | crates/ra_ide/src/inlay_hints.rs | 61 |
1 files changed, 54 insertions, 7 deletions
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs index 4b133b19b..45b9f7802 100644 --- a/crates/ra_ide/src/inlay_hints.rs +++ b/crates/ra_ide/src/inlay_hints.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! This module defines multiple types of inlay hints and their visibility |
2 | 2 | ||
3 | use hir::{Adt, HirDisplay, Semantics, Type}; | 3 | use hir::{Adt, HirDisplay, Semantics, Type}; |
4 | use ra_ide_db::RootDatabase; | 4 | use ra_ide_db::RootDatabase; |
@@ -235,8 +235,10 @@ fn should_show_param_hint( | |||
235 | param_name: &str, | 235 | param_name: &str, |
236 | argument: &ast::Expr, | 236 | argument: &ast::Expr, |
237 | ) -> bool { | 237 | ) -> bool { |
238 | let argument_string = argument.syntax().to_string(); | 238 | if param_name.is_empty() |
239 | if param_name.is_empty() || argument_string.ends_with(param_name) { | 239 | || is_argument_similar_to_param(argument, param_name) |
240 | || Some(param_name) == fn_signature.name.as_ref().map(String::as_str) | ||
241 | { | ||
240 | return false; | 242 | return false; |
241 | } | 243 | } |
242 | 244 | ||
@@ -245,12 +247,32 @@ fn should_show_param_hint( | |||
245 | } else { | 247 | } else { |
246 | fn_signature.parameters.len() | 248 | fn_signature.parameters.len() |
247 | }; | 249 | }; |
250 | |||
248 | // avoid displaying hints for common functions like map, filter, etc. | 251 | // avoid displaying hints for common functions like map, filter, etc. |
249 | if parameters_len == 1 && (param_name.len() == 1 || param_name == "predicate") { | 252 | // or other obvious words used in std |
250 | return false; | 253 | parameters_len != 1 || !is_obvious_param(param_name) |
254 | } | ||
255 | |||
256 | fn is_argument_similar_to_param(argument: &ast::Expr, param_name: &str) -> bool { | ||
257 | let argument_string = remove_ref(argument.clone()).syntax().to_string(); | ||
258 | argument_string.starts_with(¶m_name) || argument_string.ends_with(¶m_name) | ||
259 | } | ||
260 | |||
261 | fn remove_ref(expr: ast::Expr) -> ast::Expr { | ||
262 | if let ast::Expr::RefExpr(ref_expr) = &expr { | ||
263 | if let Some(inner) = ref_expr.expr() { | ||
264 | return inner; | ||
265 | } | ||
251 | } | 266 | } |
267 | expr | ||
268 | } | ||
252 | 269 | ||
253 | true | 270 | fn is_obvious_param(param_name: &str) -> bool { |
271 | let is_obvious_param_name = match param_name { | ||
272 | "predicate" | "value" | "pat" | "rhs" | "other" => true, | ||
273 | _ => false, | ||
274 | }; | ||
275 | param_name.len() == 1 || is_obvious_param_name | ||
254 | } | 276 | } |
255 | 277 | ||
256 | fn get_fn_signature(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<FunctionSignature> { | 278 | fn get_fn_signature(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<FunctionSignature> { |
@@ -1059,9 +1081,22 @@ impl Test { | |||
1059 | self | 1081 | self |
1060 | } | 1082 | } |
1061 | 1083 | ||
1084 | fn field(self, value: i32) -> Self { | ||
1085 | self | ||
1086 | } | ||
1087 | |||
1062 | fn no_hints_expected(&self, _: i32, test_var: i32) {} | 1088 | fn no_hints_expected(&self, _: i32, test_var: i32) {} |
1089 | |||
1090 | fn frob(&self, frob: bool) {} | ||
1063 | } | 1091 | } |
1064 | 1092 | ||
1093 | struct Param {} | ||
1094 | |||
1095 | fn different_order(param: &Param) {} | ||
1096 | fn different_order_mut(param: &mut Param) {} | ||
1097 | |||
1098 | fn twiddle(twiddle: bool) {} | ||
1099 | |||
1065 | fn main() { | 1100 | fn main() { |
1066 | let container: TestVarContainer = TestVarContainer { test_var: 42 }; | 1101 | let container: TestVarContainer = TestVarContainer { test_var: 42 }; |
1067 | let test: Test = Test {}; | 1102 | let test: Test = Test {}; |
@@ -1069,11 +1104,23 @@ fn main() { | |||
1069 | map(22); | 1104 | map(22); |
1070 | filter(33); | 1105 | filter(33); |
1071 | 1106 | ||
1072 | let test_processed: Test = test.map(1).filter(2); | 1107 | let test_processed: Test = test.map(1).filter(2).field(3); |
1073 | 1108 | ||
1074 | let test_var: i32 = 55; | 1109 | let test_var: i32 = 55; |
1075 | test_processed.no_hints_expected(22, test_var); | 1110 | test_processed.no_hints_expected(22, test_var); |
1076 | test_processed.no_hints_expected(33, container.test_var); | 1111 | test_processed.no_hints_expected(33, container.test_var); |
1112 | test_processed.frob(false); | ||
1113 | |||
1114 | twiddle(true); | ||
1115 | |||
1116 | let param_begin: Param = Param {}; | ||
1117 | different_order(¶m_begin); | ||
1118 | different_order(&mut param_begin); | ||
1119 | |||
1120 | let a: f64 = 7.0; | ||
1121 | let b: f64 = 4.0; | ||
1122 | let _: f64 = a.div_euclid(b); | ||
1123 | let _: f64 = a.abs_sub(b); | ||
1077 | }"#, | 1124 | }"#, |
1078 | ); | 1125 | ); |
1079 | 1126 | ||