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: resolve Self type references in delegate method assist

Browse source
This commit is contained in:
Ryan Mehri 2023-10-02 22:04:59 -07:00 • committed by Lukas Wirth
parent bc9c952b6d
commit 934358e95c
2 changed files with 197 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
use crate::helpers::mod_path_to_ast;
use either::Either;
use hir::{AsAssocItem, HirDisplay, SemanticsScope};
use hir::{AsAssocItem, HirDisplay, ModuleDef, SemanticsScope};
use rustc_hash::FxHashMap;
use syntax::{
ast::{self, make, AstNode},
@ -332,8 +332,36 @@ impl Ctx<'_> {
ted::replace(path.syntax(), subst.clone_subtree().clone_for_update());
}
}
hir::PathResolution::SelfType(imp) => {
let ty = imp.self_ty(self.source_scope.db);
let ty_str = &ty
.display_source_code(
self.source_scope.db,
self.source_scope.module().into(),
true,
)
.ok()?;
let ast_ty = make::ty(&ty_str).clone_for_update();
if let Some(adt) = ty.as_adt() {
if let ast::Type::PathType(path_ty) = &ast_ty {
let found_path = self.target_module.find_use_path(
self.source_scope.db.upcast(),
ModuleDef::from(adt),
false,
)?;
if let Some(qual) = mod_path_to_ast(&found_path).qualifier() {
let res = make::path_concat(qual, path_ty.path()?).clone_for_update();
ted::replace(path.syntax(), res.syntax());
return Some(());
}
}
}
ted::replace(path.syntax(), ast_ty.syntax());
}
hir::PathResolution::Local(_)
| hir::PathResolution::SelfType(_)
| hir::PathResolution::Def(_)
| hir::PathResolution::BuiltinAttr(_)
| hir::PathResolution::ToolModule(_)