Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 21:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Skip leading underscores unconditionally

Browse source
This commit is contained in:
Jacob Pratt 2021-01-10 04:14:39 -05:00
parent 22566ecd1b
commit 5e81892d4d
No known key found for this signature in database
GPG key ID: B80E19E4662B5AA4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/ide/src/inlay_hints.rs
View file

@ -354,8 +354,11 @@ fn is_argument_similar_to_param_name(
match get_string_representation(argument) {
None => false,
Some(argument_string) => {
let num_leading_underscores =
argument_string.bytes().take_while(|&c| c == b'_').count();
// Does the argument name begin with the parameter name? Ignore leading underscores.
let mut arg_bytes = argument_string.bytes().skip_while(|&c| c == b'_');
let mut arg_bytes = argument_string.bytes().skip(num_leading_underscores);
let starts_with_pattern = param_name.bytes().all(
|expected| matches!(arg_bytes.next(), Some(actual) if expected.eq_ignore_ascii_case(&actual)),
);
@ -365,7 +368,7 @@ fn is_argument_similar_to_param_name(
}
// Does the argument name end with the parameter name?
let mut arg_bytes = argument_string.bytes();
let mut arg_bytes = argument_string.bytes().skip(num_leading_underscores);
param_name.bytes().rev().all(
|expected| matches!(arg_bytes.next_back(), Some(actual) if expected.eq_ignore_ascii_case(&actual)),
)