mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #13090 - ice1k:master, r=Veykril

Browse Source 
Do not substitute `Self` when in same impl block

Fix #13076
This commit is contained in:
bors 2022-08-23 08:08:45 +00:00
commit 6627b473e2
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
crates/ide-assists/src/handlers/inline_call.rs
View File

@ -311,12 +311,16 @@ fn inline(
} else {
fn_body.clone_for_update()
};
if let Some(t) = body.syntax().ancestors().find_map(ast::Impl::cast).and_then(|i| i.self_ty()) {
body.syntax()
.descendants_with_tokens()
.filter_map(NodeOrToken::into_token)
.filter(|tok| tok.kind() == SyntaxKind::SELF_TYPE_KW)
.for_each(|tok| ted::replace(tok, t.syntax()));
if let Some(imp) = body.syntax().ancestors().find_map(ast::Impl::cast) {
if !node.syntax().ancestors().any(|anc| &anc == imp.syntax()) {
if let Some(t) = imp.self_ty() {
body.syntax()
.descendants_with_tokens()
.filter_map(NodeOrToken::into_token)
.filter(|tok| tok.kind() == SyntaxKind::SELF_TYPE_KW)
.for_each(|tok| ted::replace(tok, t.syntax()));
}
}
}
let usages_for_locals = |local| {
Definition::Local(local)
@ -1221,6 +1225,31 @@ fn f() -> Self { Self(114514) }
fn main() {
A(114514);
}
"#,
)
}
#[test]
fn inline_call_with_self_type_but_within_same_impl() {
check_assist(
inline_call,
r#"
struct A(u32);
impl A {
fn f() -> Self { Self(1919810) }
fn main() {
Self::f$0();
}
}
"#,
r#"
struct A(u32);
impl A {
fn f() -> Self { Self(1919810) }
fn main() {
Self(1919810);
}
}
"#,
)
}