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

fix: prefer keeping Self if it is in the same impl def

Browse source
This commit is contained in:
Ryan Mehri 2023-10-09 08:30:34 -07:00 • committed by Lukas Wirth
parent f4349ff26e
commit 7e768cbe70
4 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ide-db/src/path_transform.rs
View file

@ -183,6 +183,7 @@ impl<'a> PathTransform<'a> {
lifetime_substs,
target_module,
source_scope: self.source_scope,
same_self_type: self.target_scope.has_same_self_type(self.source_scope),
};
ctx.transform_default_values(defaulted_params);
ctx
@ -195,6 +196,7 @@ struct Ctx<'a> {
lifetime_substs: FxHashMap<LifetimeName, ast::Lifetime>,
target_module: hir::Module,
source_scope: &'a SemanticsScope<'a>,
same_self_type: bool,
}
fn postorder(item: &SyntaxNode) -> impl Iterator<Item = SyntaxNode> {
@ -333,6 +335,11 @@ impl Ctx<'_> {
}
}
hir::PathResolution::SelfType(imp) => {
// keep Self type if it does not need to be replaced
if self.same_self_type {
return None;
}
let ty = imp.self_ty(self.source_scope.db);
let ty_str = &ty
.display_source_code(
@ -349,6 +356,7 @@ impl Ctx<'_> {
self.source_scope.db.upcast(),
ModuleDef::from(adt),
false,
true,
)?;
if let Some(qual) = mod_path_to_ast(&found_path).qualifier() {