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

hir: resolve assoc trait type

Browse Source
This commit is contained in:
Jake Heinz 2021-12-01 08:44:30 +00:00
parent 2d0db312b5
commit a1b2d25810
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/hir/src/source_analyzer.rs
View File

@ -15,7 +15,7 @@ use hir_def::{
}, },
expr::{ExprId, Pat, PatId}, expr::{ExprId, Pat, PatId},
path::{ModPath, Path, PathKind}, path::{ModPath, Path, PathKind},
resolver::{resolver_for_scope, Resolver, TypeNs, ValueNs}, resolver::{resolver_for_scope, HasResolver, Resolver, TypeNs, ValueNs},
AsMacroCall, DefWithBodyId, FieldId, FunctionId, LocalFieldId, VariantId, AsMacroCall, DefWithBodyId, FieldId, FunctionId, LocalFieldId, VariantId,
}; };
use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile}; use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile};
@ -544,6 +544,17 @@ fn resolve_hir_path_(
} }
} }
}?; }?;
if let (Some(_), TypeNs::TraitId(trait_id)) = (&unresolved, &ty) {
let resolver = trait_id.resolver(db.upcast());
if let Some(module_def_id) = resolver
.resolve_module_path_in_trait_assoc_items(db.upcast(), path.mod_path())
.and_then(|ns| ns.take_types())
{
return Some(PathResolution::Def(module_def_id.into()));
}
}
let res = match ty { let res = match ty {
TypeNs::SelfType(it) => PathResolution::SelfType(it.into()), TypeNs::SelfType(it) => PathResolution::SelfType(it.into()),
TypeNs::GenericParam(id) => PathResolution::TypeParam(TypeParam { id }), TypeNs::GenericParam(id) => PathResolution::TypeParam(TypeParam { id }),