language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: inlay param hint hiding heurstic is case unsensitive

Browse source
This commit is contained in:
Lukas Wirth 2021-11-19 12:46:03 +01:00
parent cfa26c3ac3
commit cd290b427c
1 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -441,15 +441,25 @@ fn is_argument_similar_to_param_name(argument: &ast::Expr, param_name: &str) ->
None => return false, None => return false,
}; };
// std is honestly too panic happy...
let str_split_at = |str: &str, at| str.is_char_boundary(at).then(|| argument.split_at(at));
let param_name = param_name.trim_start_matches('_'); let param_name = param_name.trim_start_matches('_');
let argument = argument.trim_start_matches('_'); let argument = argument.trim_start_matches('_');
if argument.strip_prefix(param_name).map_or(false, |s| s.starts_with('_')) {
return true; match str_split_at(argument, param_name.len()) {
Some((prefix, rest)) if prefix.eq_ignore_ascii_case(param_name) => {
return rest.is_empty() || rest.starts_with('_');
}
_ => (),
} }
if argument.strip_suffix(param_name).map_or(false, |s| s.ends_with('_')) { match argument.len().checked_sub(param_name.len()).and_then(|at| str_split_at(argument, at)) {
return true; Some((rest, suffix)) if param_name.eq_ignore_ascii_case(suffix) => {
return rest.is_empty() || rest.ends_with('_');
}
_ => (),
} }
argument == param_name false
} }
/// Hide the parameter name of a unary function if it is a `_` - prefixed suffix of the function's name, or equal. /// Hide the parameter name of a unary function if it is a `_` - prefixed suffix of the function's name, or equal.
@ -464,9 +474,13 @@ fn is_param_name_suffix_of_fn_name(
match (callable.n_params(), fn_name) { match (callable.n_params(), fn_name) {
(1, Some(function)) => { (1, Some(function)) => {
function == param_name function == param_name
|| (function.len() > param_name.len() || function
&& function.ends_with(param_name) .len()
&& function[..function.len() - param_name.len()].ends_with('_')) .checked_sub(param_name.len())
.and_then(|at| function.is_char_boundary(at).then(|| function.split_at(at)))
.map_or(false, |(prefix, suffix)| {
suffix.eq_ignore_ascii_case(param_name) && prefix.ends_with('_')
})
} }
_ => false, _ => false,
} }
@ -852,6 +866,9 @@ enum CompletionKind {
fn non_ident_pat((a, b): (u32, u32)) {} fn non_ident_pat((a, b): (u32, u32)) {}
fn main() { fn main() {
const PARAM: u32 = 0;
foo(PARAM);
check(""); check("");
map(0); map(0);