diff options
Diffstat (limited to 'crates/ra_hir/src/generics.rs')
-rw-r--r-- | crates/ra_hir/src/generics.rs | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/crates/ra_hir/src/generics.rs b/crates/ra_hir/src/generics.rs index 6ae0ead1b..fcc513353 100644 --- a/crates/ra_hir/src/generics.rs +++ b/crates/ra_hir/src/generics.rs | |||
@@ -20,6 +20,7 @@ pub struct GenericParam { | |||
20 | /// Data about the generic parameters of a function, struct, impl, etc. | 20 | /// Data about the generic parameters of a function, struct, impl, etc. |
21 | #[derive(Clone, PartialEq, Eq, Debug, Default)] | 21 | #[derive(Clone, PartialEq, Eq, Debug, Default)] |
22 | pub struct GenericParams { | 22 | pub struct GenericParams { |
23 | pub(crate) parent_params: Option<Arc<GenericParams>>, | ||
23 | pub(crate) params: Vec<GenericParam>, | 24 | pub(crate) params: Vec<GenericParam>, |
24 | } | 25 | } |
25 | 26 | ||
@@ -40,28 +41,36 @@ impl GenericParams { | |||
40 | def: GenericDef, | 41 | def: GenericDef, |
41 | ) -> Arc<GenericParams> { | 42 | ) -> Arc<GenericParams> { |
42 | let mut generics = GenericParams::default(); | 43 | let mut generics = GenericParams::default(); |
44 | let parent = match def { | ||
45 | GenericDef::Function(it) => it.impl_block(db), | ||
46 | GenericDef::Type(it) => it.impl_block(db), | ||
47 | GenericDef::Struct(_) | GenericDef::Enum(_) | GenericDef::Trait(_) => None, | ||
48 | GenericDef::ImplBlock(_) => None, | ||
49 | }; | ||
50 | generics.parent_params = parent.map(|p| p.generic_params(db)); | ||
51 | let start = generics.parent_params.as_ref().map(|p| p.params.len()).unwrap_or(0) as u32; | ||
43 | match def { | 52 | match def { |
44 | GenericDef::Function(it) => generics.fill(&*it.source(db).1), | 53 | GenericDef::Function(it) => generics.fill(&*it.source(db).1, start), |
45 | GenericDef::Struct(it) => generics.fill(&*it.source(db).1), | 54 | GenericDef::Struct(it) => generics.fill(&*it.source(db).1, start), |
46 | GenericDef::Enum(it) => generics.fill(&*it.source(db).1), | 55 | GenericDef::Enum(it) => generics.fill(&*it.source(db).1, start), |
47 | GenericDef::Trait(it) => generics.fill(&*it.source(db).1), | 56 | GenericDef::Trait(it) => generics.fill(&*it.source(db).1, start), |
48 | GenericDef::Type(it) => generics.fill(&*it.source(db).1), | 57 | GenericDef::Type(it) => generics.fill(&*it.source(db).1, start), |
49 | GenericDef::ImplBlock(it) => generics.fill(&*it.source(db).1), | 58 | GenericDef::ImplBlock(it) => generics.fill(&*it.source(db).1, start), |
50 | } | 59 | } |
51 | 60 | ||
52 | Arc::new(generics) | 61 | Arc::new(generics) |
53 | } | 62 | } |
54 | 63 | ||
55 | fn fill(&mut self, node: &impl TypeParamsOwner) { | 64 | fn fill(&mut self, node: &impl TypeParamsOwner, start: u32) { |
56 | if let Some(params) = node.type_param_list() { | 65 | if let Some(params) = node.type_param_list() { |
57 | self.fill_params(params) | 66 | self.fill_params(params, start) |
58 | } | 67 | } |
59 | } | 68 | } |
60 | 69 | ||
61 | fn fill_params(&mut self, params: &ast::TypeParamList) { | 70 | fn fill_params(&mut self, params: &ast::TypeParamList, start: u32) { |
62 | for (idx, type_param) in params.type_params().enumerate() { | 71 | for (idx, type_param) in params.type_params().enumerate() { |
63 | let name = type_param.name().map(AsName::as_name).unwrap_or_else(Name::missing); | 72 | let name = type_param.name().map(AsName::as_name).unwrap_or_else(Name::missing); |
64 | let param = GenericParam { idx: idx as u32, name }; | 73 | let param = GenericParam { idx: idx as u32 + start, name }; |
65 | self.params.push(param); | 74 | self.params.push(param); |
66 | } | 75 | } |
67 | } | 76 | } |
@@ -69,4 +78,13 @@ impl GenericParams { | |||
69 | pub(crate) fn find_by_name(&self, name: &Name) -> Option<&GenericParam> { | 78 | pub(crate) fn find_by_name(&self, name: &Name) -> Option<&GenericParam> { |
70 | self.params.iter().find(|p| &p.name == name) | 79 | self.params.iter().find(|p| &p.name == name) |
71 | } | 80 | } |
81 | |||
82 | pub fn count_parent_params(&self) -> usize { | ||
83 | self.parent_params.as_ref().map(|p| p.count_params_including_parent()).unwrap_or(0) | ||
84 | } | ||
85 | |||
86 | pub fn count_params_including_parent(&self) -> usize { | ||
87 | let parent_count = self.count_parent_params(); | ||
88 | parent_count + self.params.len() | ||
89 | } | ||
72 | } | 90 | } |