Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22087 from A4-Tacks/self-ty-hints

Browse Source 
fix: Fix incorrect lifetime hints for self with type
This commit is contained in:
Shoyu Vanilla (Flint)
2026-04-19 19:20:10 +00:00
committed by GitHub
parent b603664e89 a207636bbe
commit 5247dd6dbc
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/rust-analyzer/crates/ide/src/inlay_hints/lifetime.rs
+24 -5
View File
@@ -31,7 +31,6 @@ pub(super) fn fn_hints(
let param_list = func.param_list()?;
let generic_param_list = func.generic_param_list();
let ret_type = func.ret_type();
let self_param = param_list.self_param().filter(|it| it.amp_token().is_some());
let gpl_append_range = func.name()?.syntax().text_range();
hints_(
acc,
@@ -49,7 +48,7 @@ pub(super) fn fn_hints(
}),
generic_param_list,
ret_type,
self_param,
param_list.self_param(),
|acc, allocated_lifetimes| {
acc.push(InlayHint {
range: gpl_append_range,
@@ -208,6 +207,20 @@ fn hints_(
Some(lt) => matches!(lt.text().as_str(), "'_"),
None => true,
};
let self_param = self_param.and_then(|it| {
if it.colon_token().is_none() {
return Some((it.amp_token(), it.lifetime()));
}
it.ty().map(|ty| {
let ref_type = ty.syntax().descendants().find_map(ast::RefType::cast);
let lifetime = ref_type
.as_ref()
.and_then(|it| it.lifetime())
.or_else(|| ty.syntax().descendants().find_map(ast::Lifetime::cast));
(ref_type.and_then(|it| it.amp_token()), lifetime)
})
});
let self_param = self_param.filter(|(amp, lt)| amp.is_some() || lt.is_some());
let mk_lt_hint = |t: SyntaxToken, label: String| InlayHint {
range: t.text_range(),
@@ -222,10 +235,9 @@ fn hints_(
let potential_lt_refs = {
let mut acc: Vec<_> = vec![];
if let Some(self_param) = &self_param {
let lifetime = self_param.lifetime();
if let Some((amp_token, lifetime)) = self_param.clone() {
let is_elided = is_elided(&lifetime);
acc.push((None, self_param.amp_token(), lifetime, is_elided));
acc.push((None, amp_token, lifetime, is_elided));
}
params.for_each(|(name, ty)| {
// FIXME: check path types
@@ -433,6 +445,9 @@ fn nested_out(a: &()) -> & &X< &()>{}
//^'0 ^'0 ^'0 ^'0
impl () {
fn foo(self, x: &()) -> &() {}
// ^^^<'0>
// ^'0 ^'0
fn foo(&self) {}
// ^^^<'0>
// ^'0
@@ -442,6 +457,10 @@ fn foo(&self) -> &() {}
fn foo(&self, a: &()) -> &() {}
// ^^^<'0, '1>
// ^'0 ^'1 ^'0
fn foo(self: &Self, a: &()) -> &() {}
// ^^^<'0, '1>
// ^'0 ^'1 ^'0
}
"#,
);