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

Use GenericParam in ScopeDef

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-21 14:22:30 +03:00
parent 1312c57d34
commit ca1af86e7b
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir/src/code_model.rs
View file

@ -1070,7 +1070,7 @@ pub struct ImplBlock {
pub enum ScopeDef { pub enum ScopeDef {
ModuleDef(ModuleDef), ModuleDef(ModuleDef),
MacroDef(MacroDef), MacroDef(MacroDef),
GenericParam(u32), GenericParam(GenericParam),
ImplSelfType(ImplBlock), ImplSelfType(ImplBlock),
AdtSelfType(Adt), AdtSelfType(Adt),
Local(Local), Local(Local),

12
crates/ra_hir/src/resolve.rs
View file

@ -19,7 +19,7 @@ use crate::{
code_model::Crate, code_model::Crate,
db::HirDatabase, db::HirDatabase,
expr::{ExprScopes, PatId, ScopeId}, expr::{ExprScopes, PatId, ScopeId},
DefWithBody, GenericDef, Local, MacroDef, PerNs, ScopeDef, DefWithBody, GenericDef, GenericParam, Local, MacroDef, PerNs, ScopeDef,
}; };
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
@ -447,9 +447,15 @@ impl Scope {
}); });
} }
} }
Scope::GenericParams { params, .. } => { Scope::GenericParams { params, def } => {
for param in params.params.iter() { for param in params.params.iter() {
f(param.name.clone(), ScopeDef::GenericParam(param.idx)) f(
param.name.clone(),
ScopeDef::GenericParam(GenericParam {
parent: (*def).into(),
idx: param.idx,
}),
)
} }
} }
Scope::ImplBlockScope(i) => { Scope::ImplBlockScope(i) => {